From: Daiki Ueno <dueno@redhat.com>
Date: Thu, 8 Jul 2021 17:22:36 +0000 (+0200)
Subject: BIO_lookup_ex: use AI_ADDRCONFIG only if explicit host name is given
X-Git-Tag: openssl-3.0.0-beta2~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15729bef385211bc2a0497e2d53a45c45d677d2c;p=thirdparty%2Fopenssl.git

BIO_lookup_ex: use AI_ADDRCONFIG only if explicit host name is given

The flag only affects which record types are queried via DNS (A or
AAAA, or both).  When node is NULL and AF_UNSPEC is used, it prevents
getaddrinfo returning the right address associated with the loopback
interface.

Signed-off-by: Daiki Ueno <dueno@redhat.com>

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/16033)
---

diff --git a/crypto/bio/bio_addr.c b/crypto/bio/bio_addr.c
index 0efbc3cb44a..d18c849ade1 100644
--- a/crypto/bio/bio_addr.c
+++ b/crypto/bio/bio_addr.c
@@ -696,7 +696,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
         hints.ai_protocol = protocol;
 # ifdef AI_ADDRCONFIG
 #  ifdef AF_UNSPEC
-        if (family == AF_UNSPEC)
+        if (host != NULL && family == AF_UNSPEC)
 #  endif
             hints.ai_flags |= AI_ADDRCONFIG;
 # endif