Add prefix "__" to get[a-z]*_r () to get nscd's own strong version of the

get[a-z]*_r function.

diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index a9de8599a5e7dd27d5b9c78f1730f72eb007662b..7e2c4b15c071e166ba9f2867a6c623e1298c7cec 100644 (file)
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -208,7 +208,7 @@ addgrbyname (struct database *db, int fd, request_header *req, void *key)
   if (debug_level > 0)
     dbg_log (_("Haven't found \"%s\" in group cache!"), key);
 
-  while (getgrnam_r (key, &resultbuf, buffer, buflen, &grp) != 0
+  while (__getgrnam_r (key, &resultbuf, buffer, buflen, &grp) != 0
         && errno == ERANGE)
     {
       errno = 0;
@@ -236,7 +236,7 @@ addgrbygid (struct database *db, int fd, request_header *req, void *key)
   if (debug_level > 0)
     dbg_log (_("Haven't found \"%d\" in group cache!"), gid);
 
-  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 7dc38ebd9cb6dfb0c7607885df13f2dcd9880457..6365b06b9addee55425665818b06325fe9b37cf4 100644 (file)
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -296,8 +296,8 @@ addhstbyname (struct database *db, int fd, request_header *req, void *key)
   if (debug_level > 0)
     dbg_log (_("Haven't found \"%s\" in hosts cache!"), key);
 
-  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)
     {
@@ -329,8 +329,8 @@ addhstbyaddr (struct database *db, int fd, request_header *req, void *key)
               inet_ntop (AF_INET, key, buf, sizeof (buf)));
     }
 
-  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)
     {
@@ -363,8 +363,8 @@ addhstbynamev6 (struct database *db, int fd, request_header *req, void *key)
               inet_ntop (AF_INET6, key, buf, sizeof (buf)));
     }
 
-  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)
     {
@@ -396,8 +396,8 @@ addhstbyaddrv6 (struct database *db, int fd, request_header *req, void *key)
               inet_ntop (AF_INET6, key, buf, sizeof (buf)));
     }
 
-  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 e9ee9e05dc9b14cb691ca732142bd6bf0dd1199b..86f5c310eeccef79d1cf053944ce8e05140a280f 100644 (file)
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -206,7 +206,7 @@ addpwbyname (struct database *db, int fd, request_header *req, void *key)
   if (debug_level > 0)
     dbg_log (_("Haven't found \"%s\" in password cache!"), key);
 
-  while (getpwnam_r (key, &resultbuf, buffer, buflen, &pwd) != 0
+  while (__getpwnam_r (key, &resultbuf, buffer, buflen, &pwd) != 0
         && errno == ERANGE)
     {
       errno = 0;
@@ -234,7 +234,7 @@ addpwbyuid (struct database *db, int fd, request_header *req, void *key)
   if (debug_level > 0)
     dbg_log (_("Haven't found \"%d\" in password cache!"), uid);
 
-  while (getpwuid_r (uid, &resultbuf, buffer, buflen, &pwd) != 0
+  while (__getpwuid_r (uid, &resultbuf, buffer, buflen, &pwd) != 0
         && errno == ERANGE)
     {
       errno = 0;