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 /sysdeps | |
| 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 'sysdeps')
| -rw-r--r-- | sysdeps/posix/getaddrinfo.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 740e9555d5..e95d729d4a 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -59,7 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <ifaddrs.h> #include <netdb.h> #include <nss.h> -#include <resolv.h> +#include <resolv/resolv-internal.h> #include <stdbool.h> #include <stdio.h> #include <stdio_ext.h> @@ -267,7 +267,7 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, if (herrno == NETDB_INTERNAL) \ { \ __set_h_errno (herrno); \ - _res.options |= old_res_options & RES_USE_INET6; \ + _res.options |= old_res_options & DEPRECATED_RES_USE_INET6; \ result = -EAI_SYSTEM; \ goto free_and_return; \ } \ @@ -283,7 +283,7 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, addrmem = NULL; \ if (!convert_hostent_to_gaih_addrtuple (req, _family,h, &addrmem)) \ { \ - _res.options |= old_res_options & RES_USE_INET6; \ + _res.options |= old_res_options & DEPRECATED_RES_USE_INET6; \ result = -EAI_SYSTEM; \ goto free_and_return; \ } \ @@ -808,7 +808,7 @@ gaih_inet (const char *name, const struct gaih_service *service, addresses to IPv6 addresses. Currently this is decided by setting the RES_USE_INET6 bit in _res.options. */ old_res_options = _res.options; - _res.options &= ~RES_USE_INET6; + _res.options &= ~DEPRECATED_RES_USE_INET6; while (!no_more) { @@ -845,7 +845,8 @@ gaih_inet (const char *name, const struct gaih_service *service, if (!scratch_buffer_grow (tmpbuf)) { - _res.options |= old_res_options & RES_USE_INET6; + _res.options + |= old_res_options & DEPRECATED_RES_USE_INET6; result = -EAI_MEMORY; goto free_and_return; } @@ -962,7 +963,8 @@ gaih_inet (const char *name, const struct gaih_service *service, if (canonbuf == NULL) { _res.options - |= old_res_options & RES_USE_INET6; + |= old_res_options + & DEPRECATED_RES_USE_INET6; result = -EAI_MEMORY; goto free_and_return; } @@ -1024,7 +1026,7 @@ gaih_inet (const char *name, const struct gaih_service *service, nip = nip->next; } - _res.options |= old_res_options & RES_USE_INET6; + _res.options |= old_res_options & DEPRECATED_RES_USE_INET6; if (h_errno == NETDB_INTERNAL) { |