From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 21 Apr 2003 18:28:08 +0000 (+0000)
Subject: Fix builds when getaddrinfo is not detected but getnameinfo is.
X-Git-Tag: OPENLDAP_REL_ENG_2_2_0ALPHA~304
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ca52123a60416d947b973c5194af11051d015d23;p=openldap

Fix builds when getaddrinfo is not detected but getnameinfo is.
This does not happen normally.
---

diff --git a/include/ac/socket.h b/include/ac/socket.h
index c0590c2e3d..a28eac56d0 100644
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -192,7 +192,7 @@ LDAP_F (int) ldap_pvt_inet_aton LDAP_P(( const char *, struct in_addr * ));
 #	define INET6_ADDRSTRLEN 46
 #endif
 
-#ifdef HAVE_GETADDRINFO
+#if defined( HAVE_GETADDRINFO ) || defined( HAVE_GETNAMEINFO )
 #	ifdef HAVE_GAI_STRERROR
 #		define AC_GAI_STRERROR(x)	(gai_strerror((x)))
 #	else
diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index b5601ba258..3f7ae1f615 100644
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -325,19 +325,22 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
 	const char *host, int port,
 	int async )
 {
+	int	rc;
+	int	socktype;
 	ber_socket_t		s = AC_SOCKET_INVALID;
-	int			rc, i, use_hp = 0;
-	struct hostent		*hp = NULL;
+
 #if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP )
 	char serv[7];
 	int err;
 	struct addrinfo hints, *res, *sai;
 #else
+	int i;
+	int use_hp = 0;
+	struct hostent		*hp = NULL;
 	struct hostent he_buf;
 	struct in_addr in;
-#endif
 	char   	*ha_buf=NULL, *p, *q;
-	int		socktype;
+#endif
 
 	if( host == NULL ) host = "localhost";
 	
diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index 4254c5f733..96d1fe14e8 100644
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -539,7 +539,8 @@ char * ldap_pvt_get_fqdn( char *name )
 	return fqdn;
 }
 
-#if defined( HAVE_GETADDRINFO ) && !defined( HAVE_GAI_STRERROR )
+#if ( defined( HAVE_GETADDRINFO ) || defined( HAVE_GETNAMEINFO ) ) \
+	&& !defined( HAVE_GAI_STRERROR )
 char *ldap_pvt_gai_strerror (int code) {
 	static struct {
 		int code;