(Partial) Sync with HEAD

[openldap] / libraries / libldap / os-ip.c

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 09fa94e01e4c9add84274e9fc5d9902475259f72..c3687a439781e71b33323590e4512c6d34587728 100644 (file)
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -585,10 +585,15 @@ ldap_host_connected_to( Sockbuf *sb, const char *host )
                break;
        }
 
-#if 0
        {
                char *herr;
+#ifdef NI_MAXHOST
                char hbuf[NI_MAXHOST];
+#elif defined( MAXHOSTNAMELEN
+               char hbuf[MAXHOSTNAMELEN];
+#else
+               char hbuf[256];
+#endif
                hbuf[0] = 0;
 
                if (ldap_pvt_get_hname( sa, len, hbuf, sizeof(hbuf), &herr ) == 0
@@ -597,7 +602,6 @@ ldap_host_connected_to( Sockbuf *sb, const char *host )
                        return LDAP_STRDUP( hbuf );   
                }
        }
-#endif
 
        return host ? LDAP_STRDUP( host ) : NULL;
 }