From: Andrea Bolognani <abologna@redhat.com>
Date: Wed, 18 Jan 2017 17:30:18 +0000 (+0100)
Subject: nss: Remove RES_USE_INET6 usage
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a72540f733209a50dcb00bdc96329f720258c6e5;p=thirdparty%2Flibvirt.git

nss: Remove RES_USE_INET6 usage

The recent deprecation in glibc (commit b76e065991ec) means the
module will fail to build entirely:

  nss/libvirt_nss.c: In function '_nss_libvirt_gethostbyname_r':
  nss/libvirt_nss.c:363:13: error: RES_USE_INET6 is deprecated [-Werror]
     int af = ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET);
             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

This resolver option was removed shortly after being introduced,
and application using it are already broken anyway.

(cherry picked from commit 5fff7b99db42376e00dbc7af13f08ab27c8256e7)
---

diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c
index 54c4a2a133..be6237f2a5 100644
--- a/tools/nss/libvirt_nss.c
+++ b/tools/nss/libvirt_nss.c
@@ -237,9 +237,7 @@ _nss_libvirt_gethostbyname_r(const char *name, struct hostent *result,
                              char *buffer, size_t buflen, int *errnop,
                              int *herrnop)
 {
-    int af = ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET);
-
-    return _nss_libvirt_gethostbyname3_r(name, af, result, buffer, buflen,
+    return _nss_libvirt_gethostbyname3_r(name, AF_INET, result, buffer, buflen,
                                          errnop, herrnop, NULL, NULL);
 }