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 /nscd | |
| 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 'nscd')
| -rw-r--r-- | nscd/aicache.c | 5 | ||||
| -rw-r--r-- | nscd/nscd_gethst_r.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nscd/aicache.c b/nscd/aicache.c index 32c8f57b41..f955be7e5b 100644 --- a/nscd/aicache.c +++ b/nscd/aicache.c @@ -25,6 +25,7 @@ #include <time.h> #include <unistd.h> #include <sys/mman.h> +#include <resolv/resolv-internal.h> #include <resolv/res_hconf.h> #include "dbg_log.h" @@ -110,7 +111,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, IPv6 addresses. Currently this is decided by setting the RES_USE_INET6 bit in _res.options. */ int old_res_options = _res.options; - _res.options &= ~RES_USE_INET6; + _res.options &= ~DEPRECATED_RES_USE_INET6; size_t tmpbuf6len = 1024; char *tmpbuf6 = alloca (tmpbuf6len); @@ -535,7 +536,7 @@ next_nip: } out: - _res.options |= old_res_options & RES_USE_INET6; + _res.options |= old_res_options & DEPRECATED_RES_USE_INET6; if (dataset != NULL && !alloca_used) { diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c index 7448add041..820a2fe6f7 100644 --- a/nscd/nscd_gethst_r.c +++ b/nscd/nscd_gethst_r.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <resolv.h> +#include <resolv/resolv-internal.h> #include <stdio.h> #include <string.h> #include <stdint.h> @@ -42,7 +42,7 @@ __nscd_gethostbyname_r (const char *name, struct hostent *resultbuf, { request_type reqtype; - reqtype = (_res.options & RES_USE_INET6) ? GETHOSTBYNAMEv6 : GETHOSTBYNAME; + reqtype = res_use_inet6 () ? GETHOSTBYNAMEv6 : GETHOSTBYNAME; return nscd_gethst_r (name, strlen (name) + 1, reqtype, resultbuf, buffer, buflen, result, h_errnop); |