This patch replaces gai_strerror with AC_GAI_STRERROR in daemon.c and also

uses AC_GAI_STRERROR to report getaddrinfo failures in os-ip.c
-- Stig Venass

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index b58962607a55b2ed0f5c7ddb5d0cef815292f628..8cef102b3ec4fc27b57d37b99f05f7467a9e73a4 100644 (file)
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -299,6 +299,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
        if (host != NULL) {
 #ifdef HAVE_GETADDRINFO
                char serv[7];
+               int err;
                struct addrinfo hints, *res, *sai;
 
                memset( &hints, '\0', sizeof(hints) );
@@ -306,8 +307,8 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
                hints.ai_socktype = SOCK_STREAM;
 
                snprintf(serv, sizeof serv, "%d", ntohs(port));
-               if ( getaddrinfo(host, serv, &hints, &res) ) {
-                       osip_debug(ld, "ldap_connect_to_host:getaddrinfo failed\n",0,0,0);
+               if ( err = getaddrinfo(host, serv, &hints, &res) ) {
+                       osip_debug(ld, "ldap_connect_to_host: getaddrinfo failed: %s\n", AC_GAI_STRERROR(err), 0, 0);
                        return -1;
                }
                sai = res;

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index fe735bc9a2842431d1e6a058ece610b9de0f32dc..c9eb693cdcf880cb4a0ffcbbdb43b66025f7fd9c 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -228,7 +228,7 @@ static int slap_get_listener_addresses(
                /* host specifies a service in this case */
                if (err = getaddrinfo(NULL, host, &hints, &res)) {
                        Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
-                               gai_strerror(err), 0, 0);
+                               AC_GAI_STRERROR(err), 0, 0);
                        return -1;
                }
        } else