diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-04-08 10:40:31 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-04-08 10:56:22 +0200 |
| commit | 3f8b44be0a658266adff5ece1e4bc3ce097a5dbe (patch) | |
| tree | 060ffb11ccd5433902b8c60c3e80dc0f140ec55d /resolv/resolv-internal.h | |
| parent | 94e358f6d490650c714edb1ffc3a52f56ffe086e (diff) | |
| download | glibc-3f8b44be0a658266adff5ece1e4bc3ce097a5dbe.tar glibc-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/resolv-internal.h')
| -rw-r--r-- | resolv/resolv-internal.h | 9 |
1 files changed, 3 insertions, 6 deletions
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 |