Add ldap_pvt_gai_strerror().

Calls to gai_strerror() should be replaced with calls AC_GAI_STRERROR().

diff --git a/include/ac/socket.h b/include/ac/socket.h
index e48dcb8f8454376043e299357477ff0ce1b98e00..26af7a571ad571badf8c98caa6cdb89bd932957a 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -193,4 +193,13 @@ LDAP_F (int) ldap_pvt_inet_aton LDAP_P(( const char *, struct in_addr * ));
 #      define INET6_ADDRSTRLEN 46
 #endif
 
+#ifdef HAVE_GETADDRINFO
+#      ifdef HAVE_GAI_STRERROR
+#              define AC_GAI_STRERROR(x)       (gai_strerror((x)))
+#      else
+#              define AC_GAI_STRERROR(x)       (ldap_pvt_gai_strerror((x)))
+               char * ldap_pvt_gai_strerror( int );
+#      endif
+#endif
+
 #endif /* _AC_SOCKET_H_ */

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index 9e8a59fdedabe9159116b73393c0e2e9016990aa..ffd221408188583f5ed92d32ba69f32e78ef8ad8 100644 (file)
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -413,3 +413,39 @@ char * ldap_pvt_get_fqdn( char *name )
        LDAP_FREE( ha_buf );
        return fqdn;
 }
+
+#if defined( HAVE_GETADDRINFO ) && !defined( HAVE_GAI_STRERROR )
+char *ldap_pvt_gai_strerror (int code) {
+       static struct {
+               int code;
+               const char *msg;
+       } values[] = {
+#ifdef EAI_ADDRFAMILY
+               { EAI_ADDRFAMILY, "Address family for hostname not supported" },
+#endif
+               { EAI_AGAIN, "Temporary failure in name resolution" },
+               { EAI_BADFLAGS, "Bad value for ai_flags" },
+               { EAI_FAIL, "Non-recoverable failure in name resolution" },
+               { EAI_FAMILY, "ai_family not supported" },
+               { EAI_MEMORY, "Memory allocation failure" },
+#ifdef EAI_NODATA
+               { EAI_NODATA, "No address associated with hostname" },
+#endif    
+               { EAI_NONAME, "Name or service not known" },
+               { EAI_SERVICE, "Servname not supported for ai_socktype" },
+               { EAI_SOCKTYPE, "ai_socktype not supported" },
+               { EAI_SYSTEM, "System error" },
+               { 0, NULL }
+       };
+
+       int i;
+
+       for ( i = 0; values[i].msg != NULL; i++ ) {
+               if ( values[i].code == code ) {
+                       return (char *) values[i].msg;
+               }
+       }
+       
+       return "Unknown error";
+}
+#endif