Update.

1999-07-11  H.J. Lu  <hjl@gnu.org>

	* nscd/grpcache.c: Add prefix "__" to get[a-z]*_r () to get
	nscd's own strong version of the get[a-z]*_r function.
	* nscd/hstcache.c: Likwise.
	* nscd/pwdcache.c: Likwise.

5 files changed, 20 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 979e0d2426..9906607b07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-07-11  H.J. Lu  <hjl@gnu.org>
+
+	* nscd/grpcache.c: Add prefix "__" to get[a-z]*_r () to get
+	nscd's own strong version of the get[a-z]*_r function.
+	* nscd/hstcache.c: Likwise.
+	* nscd/pwdcache.c: Likwise.
+
 1999-07-12  Ulrich Drepper  <drepper@cygnus.com>
 
 	* configure.in: Recognize 2.95 as gcc version number.
diff --git a/configure b/configure
index 0dad40db94..99abb30b5e 100755
--- a/configure
+++ b/configure
@@ -1285,7 +1285,7 @@ echo "configure:1285: checking version of $CC" >&5
   ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustp-]*[0-9.]*\).*$/\1/p'`
   case $ac_prog_version in
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-    egcs-2.9[1-9].*|egcs-2.90.2[789]|egcs-2.90.[3-9][0-9]|*gcc-2.9[1-9].*|pgcc-2.90.2[789]|pgcc-2.90.[3-9][0-9]|*2.8.[1-9]*|*2.9|*2.9.[0-9]*|cygnus-2.9[1-9].*|gcc-2.9[5-9]|gcc-2.1[0-9][0-9])
+    egcs-2.9[1-9].*|egcs-2.90.2[789]|egcs-2.90.[3-9][0-9]|*gcc-2.9[1-9].*|pgcc-2.90.2[789]|pgcc-2.90.[3-9][0-9]|*2.8.[1-9]*|*2.9|*2.9.[0-9]*|2.9[5-9]*|cygnus-2.9[1-9].*|gcc-2.9[5-9]|gcc-2.1[0-9][0-9])
        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
 
diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index 446e78ed28..7a591c81ae 100644
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -217,7 +217,7 @@ addgrbyname (struct database *db, int fd, request_header *req,
       seteuid (uid);
     }
 
-  while (getgrnam_r (key, &resultbuf, buffer, buflen, &grp) != 0
+  while (__getgrnam_r (key, &resultbuf, buffer, buflen, &grp) != 0
 	 && errno == ERANGE)
     {
       errno = 0;
@@ -256,7 +256,7 @@ addgrbygid (struct database *db, int fd, request_header *req,
       seteuid (uid);
     }
 
-  while (getgrgid_r (gid, &resultbuf, buffer, buflen, &grp) != 0
+  while (__getgrgid_r (gid, &resultbuf, buffer, buflen, &grp) != 0
 	 && errno == ERANGE)
     {
       errno = 0;
diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index 93b71a65d6..b8a80af340 100644
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -305,8 +305,8 @@ addhstbyname (struct database *db, int fd, request_header *req,
       seteuid (uid);
     }
 
-  while (gethostbyname2_r (key, AF_INET, &resultbuf, buffer, buflen, &hst,
-			   &h_errno) != 0
+  while (__gethostbyname2_r (key, AF_INET, &resultbuf, buffer, buflen,
+  			     &hst, &h_errno) != 0
 	 && h_errno == NETDB_INTERNAL
 	 && errno == ERANGE)
     {
@@ -349,8 +349,8 @@ addhstbyaddr (struct database *db, int fd, request_header *req,
       seteuid (uid);
     }
 
-  while (gethostbyaddr_r (key, INADDRSZ, AF_INET, &resultbuf, buffer, buflen,
-			  &hst, &h_errno) != 0
+  while (__gethostbyaddr_r (key, INADDRSZ, AF_INET, &resultbuf, buffer,
+  			    buflen, &hst, &h_errno) != 0
 	 && h_errno == NETDB_INTERNAL
 	 && errno == ERANGE)
     {
@@ -394,8 +394,8 @@ addhstbynamev6 (struct database *db, int fd, request_header *req,
       seteuid (uid);
     }
 
-  while (gethostbyname2_r (key, AF_INET6, &resultbuf, buffer, buflen, &hst,
-			   &h_errno) != 0
+  while (__gethostbyname2_r (key, AF_INET6, &resultbuf, buffer, buflen,
+  			     &hst, &h_errno) != 0
 	 && h_errno == NETDB_INTERNAL
 	 && errno == ERANGE)
     {
@@ -438,8 +438,8 @@ addhstbyaddrv6 (struct database *db, int fd, request_header *req,
       seteuid (uid);
     }
 
-  while (gethostbyaddr_r (key, IN6ADDRSZ, AF_INET6, &resultbuf, buffer, buflen,
-			  &hst, &h_errno) != 0
+  while (__gethostbyaddr_r (key, IN6ADDRSZ, AF_INET6, &resultbuf,
+  			    buffer, buflen, &hst, &h_errno) != 0
 	 && h_errno == NETDB_INTERNAL
 	 && errno == ERANGE)
     {
diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index 95d6ec3a6a..2e54a773ff 100644
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -215,7 +215,7 @@ addpwbyname (struct database *db, int fd, request_header *req,
       seteuid (c_uid);
     }
 
-  while (getpwnam_r (key, &resultbuf, buffer, buflen, &pwd) != 0
+  while (__getpwnam_r (key, &resultbuf, buffer, buflen, &pwd) != 0
 	 && errno == ERANGE)
     {
       errno = 0;
@@ -254,7 +254,7 @@ addpwbyuid (struct database *db, int fd, request_header *req,
       seteuid (c_uid);
     }
 
-  while (getpwuid_r (uid, &resultbuf, buffer, buflen, &pwd) != 0
+  while (__getpwuid_r (uid, &resultbuf, buffer, buflen, &pwd) != 0
 	 && errno == ERANGE)
     {
       errno = 0;