From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 19 Jul 2019 16:24:45 +0000 (+0000)
Subject: Revert "use AI_ADDRCONFIG if defined in the environment"
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~67^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ccd139355dda44b9c07c4511d9e6ce97971cbf4;p=thirdparty%2Fopenldap.git

Revert "use AI_ADDRCONFIG if defined in the environment"

This reverts commit ebf0ef5cb11fc3f92715e644d95c1bf38cc33ebb.

Depends on custom glibc from RedHat
---

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 60f81a788c..89d09936ab 100644
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -581,7 +581,8 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
 
 #if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP )
 	memset( &hints, '\0', sizeof(hints) );
-#ifdef AI_ADDRCONFIG
+#ifdef USE_AI_ADDRCONFIG /* FIXME: configure test needed */
+	/* Use AI_ADDRCONFIG only on systems where its known to be needed. */
 	hints.ai_flags = AI_ADDRCONFIG;
 #endif
 	hints.ai_family = ldap_int_inet4or6;