From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 23 Jul 2019 14:45:16 +0000 (+0000)
Subject: ITS#7585 - Windows doesn't support LDAPI
X-Git-Tag: OPENLDAP_REL_ENG_2_4_48^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f25fbc9b92823540db460b7618988d3feafbc50;p=thirdparty%2Fopenldap.git

ITS#7585 - Windows doesn't support LDAPI

Adjust patch for ITS#7585 as Windows does not have LDAPI support.
---

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 0c6e9f9471..d44b1b4f9b 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -385,7 +385,9 @@ ldap_int_sasl_bind(
 	struct berval	ccred = BER_BVNULL;
 	int saslrc, rc;
 	unsigned credlen;
+#if !defined(_WIN32)
 	char my_hostname[HOST_NAME_MAX + 1];
+#endif
 	int free_saslhost = 0;
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_bind: %s\n",
@@ -448,7 +450,9 @@ ldap_int_sasl_bind(
 			/* If we don't need to canonicalize just use the host
 			 * from the LDAP URI.
 			 * Always use the result of gethostname() for LDAPI.
+			 * Skip for Windows which doesn't support LDAPI.
 			 */
+#if !defined(_WIN32)
 			if (ld->ld_defconn->lconn_server->lud_scheme != NULL &&
 			    strcmp("ldapi", ld->ld_defconn->lconn_server->lud_scheme) == 0) {
 				rc = gethostname(my_hostname, HOST_NAME_MAX + 1);
@@ -457,7 +461,9 @@ ldap_int_sasl_bind(
 				} else {
 					saslhost = "localhost";
 				}
-			} else if ( nocanon )
+			} else
+#endif
+			if ( nocanon )
 				saslhost = ld->ld_defconn->lconn_server->lud_host;
 			else {
 				saslhost = ldap_host_connected_to( ld->ld_defconn->lconn_sb,