diff --git a/ChangeLog b/ChangeLog index f832f634c0..714e5040cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 1999-11-26 Ulrich Drepper + * inet/rcmd.c (ruserok): Use iruserok2 not iruserok. + * locale/iso-3166.def: Update from latest official list. 1999-11-26 Andreas Jaeger diff --git a/inet/rcmd.c b/inet/rcmd.c index 122668da8f..ace393fa5e 100644 --- a/inet/rcmd.c +++ b/inet/rcmd.c @@ -56,7 +56,10 @@ static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94"; int __ivaliduser __P ((FILE *, u_int32_t, const char *, const char *)); static int __ivaliduser2 __P ((FILE *, u_int32_t, const char *, const char *, const char *)); -int iruserok (u_int32_t raddr, int superuser, const char *ruser, *luser); +static int iruserok2 (u_int32_t raddr, int superuser, const char *ruser, + const char *luser, const char *rhost); +int iruserok (u_int32_t raddr, int superuser, const char *ruser, + const char *luser); int @@ -286,7 +289,7 @@ ruserok(rhost, superuser, ruser, luser) for (ap = hp->h_addr_list; *ap; ++ap) { bcopy(*ap, &addr, sizeof(addr)); - if (iruserok(addr, superuser, ruser, luser, rhost) == 0) + if (iruserok2(addr, superuser, ruser, luser, rhost) == 0) return 0; } return -1;