Commit 1f25fbc9 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#7585 - Windows doesn't support LDAPI

Adjust patch for ITS#7585 as Windows does not have LDAPI support.
parent 84fc26b6
...@@ -385,7 +385,9 @@ ldap_int_sasl_bind( ...@@ -385,7 +385,9 @@ ldap_int_sasl_bind(
struct berval ccred = BER_BVNULL; struct berval ccred = BER_BVNULL;
int saslrc, rc; int saslrc, rc;
unsigned credlen; unsigned credlen;
#if !defined(_WIN32)
char my_hostname[HOST_NAME_MAX + 1]; char my_hostname[HOST_NAME_MAX + 1];
#endif
int free_saslhost = 0; int free_saslhost = 0;
Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_bind: %s\n", Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_bind: %s\n",
...@@ -448,7 +450,9 @@ ldap_int_sasl_bind( ...@@ -448,7 +450,9 @@ ldap_int_sasl_bind(
/* If we don't need to canonicalize just use the host /* If we don't need to canonicalize just use the host
* from the LDAP URI. * from the LDAP URI.
* Always use the result of gethostname() for LDAPI. * 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 && if (ld->ld_defconn->lconn_server->lud_scheme != NULL &&
strcmp("ldapi", ld->ld_defconn->lconn_server->lud_scheme) == 0) { strcmp("ldapi", ld->ld_defconn->lconn_server->lud_scheme) == 0) {
rc = gethostname(my_hostname, HOST_NAME_MAX + 1); rc = gethostname(my_hostname, HOST_NAME_MAX + 1);
...@@ -457,7 +461,9 @@ ldap_int_sasl_bind( ...@@ -457,7 +461,9 @@ ldap_int_sasl_bind(
} else { } else {
saslhost = "localhost"; saslhost = "localhost";
} }
} else if ( nocanon ) } else
#endif
if ( nocanon )
saslhost = ld->ld_defconn->lconn_server->lud_host; saslhost = ld->ld_defconn->lconn_server->lud_host;
else { else {
saslhost = ldap_host_connected_to( ld->ld_defconn->lconn_sb, saslhost = ldap_host_connected_to( ld->ld_defconn->lconn_sb,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment