From ea30eb86e5a370fb8cb94e352e075e24d940d159 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 17 Jul 2014 19:27:48 +0200 Subject: [PATCH] nss-util: be a tiny bit more compatible with glibc's lookup behaviour regarding IPv6 Check for RES_USE_INET6 before we prefer IPv6 over IPv4, for all our NSS modules. (Not that the DNS resolver that is configured with this matters to us, but hey, let's try to be compatible). --- src/shared/nss-util.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/shared/nss-util.h b/src/shared/nss-util.h index 2c897d852..230a98604 100644 --- a/src/shared/nss-util.h +++ b/src/shared/nss-util.h @@ -23,6 +23,7 @@ #include #include +#include #define NSS_GETHOSTBYNAME_PROTOTYPES(module) \ enum nss_status _nss_##module##_gethostbyname4_r( \ @@ -87,14 +88,27 @@ enum nss_status _nss_##module##_gethostbyname_r( \ struct hostent *host, \ char *buffer, size_t buflen, \ int *errnop, int *h_errnop) { \ - return _nss_##module##_gethostbyname3_r( \ + enum nss_status ret = NSS_STATUS_NOTFOUND; \ + \ + if (_res.options & RES_USE_INET6) \ + ret = _nss_##module##_gethostbyname3_r( \ + name, \ + AF_INET6, \ + host, \ + buffer, buflen, \ + errnop, h_errnop, \ + NULL, \ + NULL); \ + if (ret == NSS_STATUS_NOTFOUND) \ + ret = _nss_##module##_gethostbyname3_r( \ name, \ - AF_UNSPEC, \ + AF_INET, \ host, \ buffer, buflen, \ errnop, h_errnop, \ NULL, \ NULL); \ + return ret; \ } #define NSS_GETHOSTBYADDR_FALLBACKS(module) \ -- 2.30.2