diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-10-04 11:52:10 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-12-31 18:55:14 +0100 |
| commit | b76e065991ec01299225d9da90a627ebe6c1ac97 (patch) | |
| tree | ac94cc82b134096975419ced320f6ed329130756 /nss/digits_dots.c | |
| parent | 5840c75c2d6a9b980d6789f2ca7d47a9fa067263 (diff) | |
| download | glibc-b76e065991ec01299225d9da90a627ebe6c1ac97.tar.gz glibc-b76e065991ec01299225d9da90a627ebe6c1ac97.tar.xz glibc-b76e065991ec01299225d9da90a627ebe6c1ac97.zip | |
resolv: Deprecate the "inet6" option and RES_USE_INET6 [BZ #19582]
Diffstat (limited to 'nss/digits_dots.c')
| -rw-r--r-- | nss/digits_dots.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nss/digits_dots.c b/nss/digits_dots.c index 57f0e4db67..14f5b56fae 100644 --- a/nss/digits_dots.c +++ b/nss/digits_dots.c @@ -22,7 +22,7 @@ #include <stdlib.h> #include <ctype.h> #include <wctype.h> -#include <resolv.h> +#include <resolv/resolv-internal.h> #include <netdb.h> #include <arpa/inet.h> #include "nsswitch.h" @@ -80,7 +80,7 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf, break; default: - af = (_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET; + af = res_use_inet6 () ? AF_INET6 : AF_INET; addr_size = af == AF_INET6 ? IN6ADDRSZ : INADDRSZ; break; } @@ -167,7 +167,7 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf, (*h_addr_ptrs)[0] = (char *) host_addr; (*h_addr_ptrs)[1] = NULL; resbuf->h_addr_list = *h_addr_ptrs; - if (af == AF_INET && (_res.options & RES_USE_INET6)) + if (af == AF_INET && res_use_inet6 ()) { /* We need to change the IP v4 address into the IP v6 address. */ @@ -211,7 +211,7 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf, switch (af) { default: - af = (_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET; + af = res_use_inet6 () ? AF_INET6 : AF_INET; if (af == AF_INET6) { addr_size = IN6ADDRSZ; |