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

Revert "use AI_ADDRCONFIG if defined in the environment"

This reverts commit 33945aeb96124f5956c0657b41bb68ca29fab66c.

Depends on custom glibc from RedHat
---

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index d48e28caa6..3c1fd15df8 100644
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -594,7 +594,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;