From: Daniel P. Berrangé <berrange@redhat.com>
Date: Thu, 23 Jan 2020 11:40:39 +0000 (+0000)
Subject: src: conditionalize EAI_ADDRFAMILY
X-Git-Tag: v6.1.0-rc1~322
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e429934550be5417a1576efce6d94ec032f1ecee;p=thirdparty%2Flibvirt.git

src: conditionalize EAI_ADDRFAMILY

The EAI_ADDRFAMILY constant has been removed from FreeBSD
headers, supposedly because it is deprecated by new RFC
drafts.

Previously GNULIB was providing a replacement because
MinGW lacked it too. The replacement provided for MinGW
was thus being used on FreeBSD too, but with a completely
bogus integer value.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index b0af7d4dfa..be9ac9aeed 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -178,8 +178,10 @@ int virNetSocketCheckProtocols(bool *hasIPv4,
     hints.ai_socktype = SOCK_STREAM;
 
     if ((gaierr = getaddrinfo("::1", NULL, &hints, &ai)) != 0) {
-        if (gaierr == EAI_ADDRFAMILY ||
-            gaierr == EAI_FAMILY ||
+        if (gaierr == EAI_FAMILY ||
+# ifdef EAI_ADDRFAMILY
+            gaierr == EAI_ADDRFAMILY ||
+# endif
             gaierr == EAI_NONAME) {
             *hasIPv6 = false;
         } else {