summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-04-08 10:40:31 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-04-08 10:56:22 +0200
commit3f8b44be0a658266adff5ece1e4bc3ce097a5dbe (patch)
tree060ffb11ccd5433902b8c60c3e80dc0f140ec55d /resolv/res_init.c
parentaarch64: thunderx2 memcpy implementation cleanup and streamlining (diff)
downloadglibc-3f8b44be0a658266adff5ece1e4bc3ce097a5dbe.tar.gz
glibc-3f8b44be0a658266adff5ece1e4bc3ce097a5dbe.tar.bz2
glibc-3f8b44be0a658266adff5ece1e4bc3ce097a5dbe.zip
resolv: Remove support for RES_USE_INET6 and the inet6 option
This functionality was deprecated in glibc 2.25. This commit only includes the core changes to remove the functionality. It does not remove the RES_USE_INET6 handling in the individual NSS service modules and the res_use_inet6 function. These changes will happen in future commits.
Diffstat (limited to 'resolv/res_init.c')
-rw-r--r--resolv/res_init.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/resolv/res_init.c b/resolv/res_init.c
index 265e3cc6e3..936fbcb7bd 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -672,7 +672,6 @@ res_setoptions (struct resolv_conf_parser *parser, const char *options)
unsigned long int flag;
} options[] = {
#define STRnLEN(str) str, sizeof (str) - 1
- { STRnLEN ("inet6"), 0, DEPRECATED_RES_USE_INET6 },
{ STRnLEN ("rotate"), 0, RES_ROTATE },
{ STRnLEN ("edns0"), 0, RES_USE_EDNS0 },
{ STRnLEN ("single-request-reopen"), 0, RES_SNGLKUPREOP },