|
 |
ff5c1ad |
From 69709289b083c53ba41d2cef7d65120220f8c59b Mon Sep 17 00:00:00 2001
|
|
|
ff5c1ad |
From: Sumit Bose <sbose@redhat.com>
|
|
|
ff5c1ad |
Date: Tue, 7 May 2013 17:02:57 +0200
|
|
|
ff5c1ad |
Subject: [PATCH] LDAPI SASL fix
|
|
|
ff5c1ad |
|
|
|
ff5c1ad |
Resolves: #960222
|
|
|
ff5c1ad |
---
|
|
|
ff5c1ad |
libraries/libldap/cyrus.c | 19 ++++++++++++++++---
|
|
|
ff5c1ad |
1 Datei geändert, 16 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
|
|
|
ff5c1ad |
|
|
|
ff5c1ad |
diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
|
|
|
ff5c1ad |
index 28c241b..a9acf36 100644
|
|
|
ff5c1ad |
--- a/libraries/libldap/cyrus.c
|
|
|
ff5c1ad |
+++ b/libraries/libldap/cyrus.c
|
|
|
ff5c1ad |
@@ -394,6 +394,8 @@ ldap_int_sasl_bind(
|
|
|
ff5c1ad |
struct berval ccred = BER_BVNULL;
|
|
|
ff5c1ad |
int saslrc, rc;
|
|
|
ff5c1ad |
unsigned credlen;
|
|
|
ff5c1ad |
+ char my_hostname[HOST_NAME_MAX + 1];
|
|
|
ff5c1ad |
+ int free_saslhost = 0;
|
|
|
ff5c1ad |
|
|
|
ff5c1ad |
Debug( LDAP_DEBUG_TRACE, "ldap_int_sasl_bind: %s\n",
|
|
|
ff5c1ad |
mechs ? mechs : "<null>", 0, 0 );
|
|
|
ff5c1ad |
@@ -454,14 +456,25 @@ ldap_int_sasl_bind(
|
|
|
ff5c1ad |
|
|
|
ff5c1ad |
/* If we don't need to canonicalize just use the host
|
|
|
ff5c1ad |
* from the LDAP URI.
|
|
|
ff5c1ad |
+ * Always use the result of gethostname() for LDAPI.
|
|
|
ff5c1ad |
*/
|
|
|
ff5c1ad |
- if ( nocanon )
|
|
|
ff5c1ad |
+ if (ld->ld_defconn->lconn_server->lud_scheme != NULL &&
|
|
|
ff5c1ad |
+ strcmp("ldapi", ld->ld_defconn->lconn_server->lud_scheme) == 0) {
|
|
|
ff5c1ad |
+ rc = gethostname(my_hostname, HOST_NAME_MAX + 1);
|
|
|
ff5c1ad |
+ if (rc == 0) {
|
|
|
ff5c1ad |
+ saslhost = my_hostname;
|
|
|
ff5c1ad |
+ } else {
|
|
|
ff5c1ad |
+ saslhost = "localhost";
|
|
|
ff5c1ad |
+ }
|
|
|
ff5c1ad |
+ } else if ( nocanon )
|
|
|
ff5c1ad |
saslhost = ld->ld_defconn->lconn_server->lud_host;
|
|
|
ff5c1ad |
- else
|
|
|
ff5c1ad |
+ else {
|
|
|
ff5c1ad |
saslhost = ldap_host_connected_to( ld->ld_defconn->lconn_sb,
|
|
|
ff5c1ad |
"localhost" );
|
|
|
ff5c1ad |
+ free_saslhost = 1;
|
|
|
ff5c1ad |
+ }
|
|
|
ff5c1ad |
rc = ldap_int_sasl_open( ld, ld->ld_defconn, saslhost );
|
|
|
ff5c1ad |
- if ( !nocanon )
|
|
|
ff5c1ad |
+ if ( free_saslhost )
|
|
|
ff5c1ad |
LDAP_FREE( saslhost );
|
|
|
ff5c1ad |
}
|
|
|
ff5c1ad |
|
|
|
ff5c1ad |
--
|
|
|
ff5c1ad |
1.7.11.7
|
|
|
ff5c1ad |
|