nss_files: Remove RES_USE_INET6 from hosts processing

Since commit 3f8b44be0a658266adff5ece1e4bc3ce097a5dbe ("resolv:
Remove support for RES_USE_INET6 and the inet6 option"),
res_use_inet6 () always evaluates to false.

diff --git a/ChangeLog b/ChangeLog
index 0f6ee3ec8e45a749386513f3e348086cdf4bb161..74f038ec3673e588d1e045207c4f24c9a60e98ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2019-05-16  Florian Weimer  <fweimer@redhat.com>
+
+       * nss/nss_files/files-hosts.c (EXTRA_ARGS, EXTRA_ARGS_DECL):
+       Remove flags.
+       (LINE_PARSER): Remove address mapping.
+       (EXTRA_ARGS_VALUE): Remove flags argument.
+       (gethostbyname3_multi): Likewise.  Adjust call to internal_getent.
+       (_nss_files_gethostbyname3_r): Adjust calls to internal_getent and
+       gethostbyname3_multi.
+       (_nss_files_gethostbyname_r): Always use AF_INET.  Adjust call to
+       _nss_files_gethostbyname3_r.
+       (_nss_files_gethostbyname4_r): Adjust call to internal_getent.
+
 2019-05-16  Florian Weimer  <fweimer@redhat.com>
 
        * support/support_test_compare_blob.c (report_blob): Report

diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c
index 2ce0dc3b4c10e0398f6b5e21ae9193da3fa02e5d..da5967a87dddf1fb0488049204236217727923ed 100644 (file)
--- a/nss/nss_files/files-hosts.c
+++ b/nss/nss_files/files-hosts.c
@@ -27,7 +27,6 @@
 
 
 /* Get implementation for some internal functions.  */
-#include "../resolv/mapv4v6addr.h"
 #include "../resolv/res_hconf.h"
 
 
@@ -35,8 +34,8 @@
 #define DATABASE       "hosts"
 #define NEED_H_ERRNO
 
-#define EXTRA_ARGS      , af, flags
-#define EXTRA_ARGS_DECL         , int af, int flags
+#define EXTRA_ARGS      , af
+#define EXTRA_ARGS_DECL         , int af
 
 #define ENTDATA hostent_data
 struct hostent_data
@@ -61,12 +60,7 @@ LINE_PARSER
      af = af == AF_UNSPEC ? AF_INET : af;
    else
      {
-       if (af == AF_INET6 && (flags & AI_V4MAPPED) != 0
-          && inet_pton (AF_INET, addr, entdata->host_addr) > 0)
-        map_v4v6_address ((char *) entdata->host_addr,
-                          (char *) entdata->host_addr);
-       else if (af == AF_INET
-               && inet_pton (AF_INET6, addr, entdata->host_addr) > 0)
+       if (af == AF_INET && inet_pton (AF_INET6, addr, entdata->host_addr) > 0)
         {
           if (IN6_IS_ADDR_V4MAPPED (entdata->host_addr))
             memcpy (entdata->host_addr, entdata->host_addr + 12, INADDRSZ);
@@ -99,16 +93,13 @@ LINE_PARSER
    STRING_FIELD (result->h_name, isspace, 1);
  })
 
-#define EXTRA_ARGS_VALUE \
-  , (res_use_inet6 () ? AF_INET6 : AF_INET),                 \
-  (res_use_inet6 () ? AI_V4MAPPED : 0)
+#define EXTRA_ARGS_VALUE , AF_INET
 #include "files-XXX.c"
 #undef EXTRA_ARGS_VALUE
 
 /* We only need to consider IPv4 mapped addresses if the input to the
    gethostbyaddr() function is an IPv6 address.  */
-#define EXTRA_ARGS_VALUE \
-  , af, (len == IN6ADDRSZ ? AI_V4MAPPED : 0)
+#define EXTRA_ARGS_VALUE , af
 DB_LOOKUP (hostbyaddr, ,,,
           {
             if (result->h_length == (int) len
@@ -126,7 +117,7 @@ DB_LOOKUP (hostbyaddr, ,,,
 static enum nss_status
 gethostbyname3_multi (FILE * stream, const char *name, int af,
                      struct hostent *result, char *buffer, size_t buflen,
-                     int *errnop, int *herrnop, int flags)
+                     int *errnop, int *herrnop)
 {
   assert (af == AF_INET || af == AF_INET6);
 
@@ -160,8 +151,7 @@ gethostbyname3_multi (FILE * stream, const char *name, int af,
   while (true)
     {
       status = internal_getent (stream, &tmp_result_buf, tmp_buffer.data,
-                               tmp_buffer.length, errnop, herrnop, af,
-                               flags);
+                               tmp_buffer.length, errnop, herrnop, af);
       /* Enlarge the buffer if necessary.  */
       if (status == NSS_STATUS_TRYAGAIN && *herrnop == NETDB_INTERNAL
          && *errnop == ERANGE)
@@ -345,12 +335,8 @@ _nss_files_gethostbyname3_r (const char *name, int af, struct hostent *result,
 
   if (status == NSS_STATUS_SUCCESS)
     {
-      /* XXX Is using _res to determine whether we want to convert IPv4
-         addresses to IPv6 addresses really the right thing to do?  */
-      int flags = (res_use_inet6 () ? AI_V4MAPPED : 0);
-
       while ((status = internal_getent (stream, result, buffer, buflen, errnop,
-                                       herrnop, af, flags))
+                                       herrnop, af))
             == NSS_STATUS_SUCCESS)
        {
          LOOKUP_NAME_CASE (h_name, h_aliases)
@@ -359,7 +345,7 @@ _nss_files_gethostbyname3_r (const char *name, int af, struct hostent *result,
       if (status == NSS_STATUS_SUCCESS
          && _res_hconf.flags & HCONF_FLAG_MULTI)
        status = gethostbyname3_multi
-         (stream, name, af, result, buffer, buflen, errnop, herrnop, flags);
+         (stream, name, af, result, buffer, buflen, errnop, herrnop);
 
       internal_endent (&stream);
     }
@@ -375,9 +361,7 @@ _nss_files_gethostbyname_r (const char *name, struct hostent *result,
                            char *buffer, size_t buflen, int *errnop,
                            int *herrnop)
 {
-  int af = (res_use_inet6 () ? AF_INET6 : AF_INET);
-
-  return _nss_files_gethostbyname3_r (name, af, result, buffer, buflen,
+  return _nss_files_gethostbyname3_r (name, AF_INET, result, buffer, buflen,
                                      errnop, herrnop, NULL, NULL);
 }
 
@@ -414,7 +398,7 @@ _nss_files_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,
 
          struct hostent result;
          status = internal_getent (stream, &result, buffer, buflen, errnop,
-                                   herrnop, AF_UNSPEC, 0);
+                                   herrnop, AF_UNSPEC);
          if (status != NSS_STATUS_SUCCESS)
            break;