diff options
Diffstat (limited to 'nscd')
| -rw-r--r-- | nscd/aicache.c | 8 | ||||
| -rw-r--r-- | nscd/nscd_gethst_r.c | 6 |
2 files changed, 2 insertions, 12 deletions
diff --git a/nscd/aicache.c b/nscd/aicache.c index cf9b91d149..5b94e2aa9e 100644 --- a/nscd/aicache.c +++ b/nscd/aicache.c @@ -27,7 +27,6 @@ #include <sys/mman.h> #include <resolv/resolv-internal.h> #include <resolv/resolv_context.h> -#include <resolv/res_use_inet6.h> #include <scratch_buffer.h> #include "dbg_log.h" @@ -100,12 +99,8 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, no_more = 0; nip = hosts_database; - /* Initialize configurations. If we are looking for both IPv4 and - IPv6 address we don't want the lookup functions to automatically - promote IPv4 addresses to IPv6 addresses. Therefore, use the - _no_inet6 variant. */ + /* Initialize configurations. */ struct resolv_context *ctx = __resolv_context_get (); - bool enable_inet6 = __resolv_context_disable_inet6 (ctx); if (ctx == NULL) no_more = 1; @@ -513,7 +508,6 @@ next_nip: } out: - __resolv_context_enable_inet6 (ctx, enable_inet6); __resolv_context_put (ctx); if (dataset != NULL && !alloca_used) diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c index 97c6190c95..f4c5849862 100644 --- a/nscd/nscd_gethst_r.c +++ b/nscd/nscd_gethst_r.c @@ -40,11 +40,7 @@ __nscd_gethostbyname_r (const char *name, struct hostent *resultbuf, char *buffer, size_t buflen, struct hostent **result, int *h_errnop) { - request_type reqtype; - - reqtype = res_use_inet6 () ? GETHOSTBYNAMEv6 : GETHOSTBYNAME; - - return nscd_gethst_r (name, strlen (name) + 1, reqtype, resultbuf, + return nscd_gethst_r (name, strlen (name) + 1, GETHOSTBYNAME, resultbuf, buffer, buflen, result, h_errnop); } |