From 3f8b44be0a658266adff5ece1e4bc3ce097a5dbe Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 8 Apr 2019 10:40:31 +0200 Subject: 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. --- resolv/resolv-internal.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'resolv/resolv-internal.h') diff --git a/resolv/resolv-internal.h b/resolv/resolv-internal.h index 1500adc607..3aca6804f4 100644 --- a/resolv/resolv-internal.h +++ b/resolv/resolv-internal.h @@ -27,15 +27,12 @@ #define RES_F_CONN 0x00000002 /* Socket is connected. */ #define RES_F_EDNS0ERR 0x00000004 /* EDNS0 caused errors. */ - -/* Internal version of RES_USE_INET6 which does not trigger a - deprecation warning. */ -#define DEPRECATED_RES_USE_INET6 0x00002000 - +/* Legacy function. This needs to be removed once all NSS modules + have been adjusted. */ static inline bool res_use_inet6 (void) { - return _res.options & DEPRECATED_RES_USE_INET6; + return false; } enum -- cgit v1.2.3