From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 26 Nov 1999 22:23:27 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~26517
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70e22d49c55bfc1b5108d2a726183795b41b2a45;p=external%2Fglibc.git

Update.

	* inet/rcmd.c (ruserok): Use iruserok2 not iruserok.
---

diff --git a/ChangeLog b/ChangeLog
index f832f63..714e504 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 1999-11-26  Ulrich Drepper  <drepper@cygnus.com>
 
+	* inet/rcmd.c (ruserok): Use iruserok2 not iruserok.
+
 	* locale/iso-3166.def: Update from latest official list.
 
 1999-11-26  Andreas Jaeger  <aj@suse.de>
diff --git a/inet/rcmd.c b/inet/rcmd.c
index 122668d..ace393f 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;