Apply https://sourceware.org/git/?p=glibc.git;a=commit;h=d5dd6189d506068ed11c8bfa1e1e...

[eglibc.git] / nss / digits_dots.c

diff --git a/nss/digits_dots.c b/nss/digits_dots.c
index 9576dd53b74b1cc3298f034b68ccefe5b948069f..4b0b61cc4074f3eb1c88199ec0d887b6fbb4f3f7 100644 (file)
--- a/nss/digits_dots.c
+++ b/nss/digits_dots.c
@@ -47,7 +47,10 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf,
     {
       if (h_errnop)
        *h_errnop = NETDB_INTERNAL;
-      *result = NULL;
+      if (buffer_size == NULL)
+       *status = NSS_STATUS_TRYAGAIN;
+      else
+       *result = NULL;
       return -1;
     }
 
@@ -84,14 +87,16 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf,
        }
 
       size_needed = (sizeof (*host_addr)
-                    + sizeof (*h_addr_ptrs) + strlen (name) + 1);
+                    + sizeof (*h_addr_ptrs)
+                    + sizeof (*h_alias_ptr) + strlen (name) + 1);
 
       if (buffer_size == NULL)
         {
          if (buflen < size_needed)
            {
+             *status = NSS_STATUS_TRYAGAIN;
              if (h_errnop != NULL)
-               *h_errnop = TRY_AGAIN;
+               *h_errnop = NETDB_INTERNAL;
              __set_errno (ERANGE);
              goto done;
            }
@@ -110,7 +115,7 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf,
              *buffer_size = 0;
              __set_errno (save);
              if (h_errnop != NULL)
-               *h_errnop = TRY_AGAIN;
+               *h_errnop = NETDB_INTERNAL;
              *result = NULL;
              goto done;
            }
@@ -150,7 +155,9 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf,
                  if (! ok)
                    {
                      *h_errnop = HOST_NOT_FOUND;
-                     if (buffer_size)
+                     if (buffer_size == NULL)
+                       *status = NSS_STATUS_NOTFOUND;
+                     else
                        *result = NULL;
                      goto done;
                    }
@@ -191,7 +198,7 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf,
                  if (buffer_size == NULL)
                    *status = NSS_STATUS_SUCCESS;
                  else
-                  *result = resbuf;
+                   *result = resbuf;
                  goto done;
                }
 
@@ -202,15 +209,6 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf,
 
       if ((isxdigit (name[0]) && strchr (name, ':') != NULL) || name[0] == ':')
        {
-         const char *cp;
-         char *hostname;
-         typedef unsigned char host_addr_t[16];
-         host_addr_t *host_addr;
-         typedef char *host_addr_list_t[2];
-         host_addr_list_t *h_addr_ptrs;
-         size_t size_needed;
-         int addr_size;
-
          switch (af)
            {
            default:
@@ -226,7 +224,10 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf,
              /* This is not possible.  We cannot represent an IPv6 address
                 in an `struct in_addr' variable.  */
              *h_errnop = HOST_NOT_FOUND;
-             *result = NULL;
+             if (buffer_size == NULL)
+               *status = NSS_STATUS_NOTFOUND;
+             else
+               *result = NULL;
              goto done;
 
            case AF_INET6:
@@ -234,42 +235,6 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf,
              break;
            }
 
-         size_needed = (sizeof (*host_addr)
-                        + sizeof (*h_addr_ptrs) + strlen (name) + 1);
-
-         if (buffer_size == NULL && buflen < size_needed)
-           {
-             if (h_errnop != NULL)
-               *h_errnop = TRY_AGAIN;
-             __set_errno (ERANGE);
-             goto done;
-           }
-         else if (buffer_size != NULL && *buffer_size < size_needed)
-           {
-             char *new_buf;
-             *buffer_size = size_needed;
-             new_buf = realloc (*buffer, *buffer_size);
-
-             if (new_buf == NULL)
-               {
-                 save = errno;
-                 free (*buffer);
-                 __set_errno (save);
-                 *buffer = NULL;
-                 *buffer_size = 0;
-                 *result = NULL;
-                 goto done;
-               }
-             *buffer = new_buf;
-           }
-
-         memset (*buffer, '\0', size_needed);
-
-         host_addr = (host_addr_t *) *buffer;
-         h_addr_ptrs = (host_addr_list_t *)
-           ((char *) host_addr + sizeof (*host_addr));
-         hostname = (char *) h_addr_ptrs + sizeof (*h_addr_ptrs);
-
          for (cp = name;; ++cp)
            {
              if (!*cp)
@@ -282,7 +247,9 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf,
                  if (inet_pton (AF_INET6, name, host_addr) <= 0)
                    {
                      *h_errnop = HOST_NOT_FOUND;
-                     if (buffer_size)
+                     if (buffer_size == NULL)
+                       *status = NSS_STATUS_NOTFOUND;
+                     else
                        *result = NULL;
                      goto done;
                    }