From: Timo Sirainen <tss@iki.fi>
Date: Mon, 16 Mar 2015 20:48:39 +0000 (+0200)
Subject: auth ldap: Improved ldap_initialize() failure's error logging.
X-Git-Tag: 2.2.17.rc1~266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22513dfdaa98cf387db64b0b41b036e2e7453b0e;p=thirdparty%2Fdovecot%2Fcore.git

auth ldap: Improved ldap_initialize() failure's error logging.
---

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index 8a6fd032ef..c0cd0efb12 100644
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -1136,18 +1136,22 @@ int db_ldap_connect(struct ldap_connection *conn)
 	if (conn->ld == NULL) {
 		if (conn->set.uris != NULL) {
 #ifdef LDAP_HAVE_INITIALIZE
-			if (ldap_initialize(&conn->ld, conn->set.uris) != LDAP_SUCCESS)
+			ret = ldap_initialize(&conn->ld, conn->set.uris);
+			if (ret != LDAP_SUCCESS) {
+				i_fatal("LDAP: ldap_initialize() failed with uris %s: %s",
+					conn->set.uris, ldap_err2string(ret));
 				conn->ld = NULL;
+			}
 #else
 			i_unreached(); /* already checked at init */
 #endif
-		} else
+		} else {
 			conn->ld = ldap_init(conn->set.hosts, LDAP_PORT);
-
-		if (conn->ld == NULL)
-			i_fatal("LDAP: ldap_init() failed with hosts: %s",
-				conn->set.hosts);
-
+			if (conn->ld == NULL) {
+				i_fatal("LDAP: ldap_init() failed with hosts: %s",
+					conn->set.hosts);
+			}
+		}
 		db_ldap_set_options(conn);
 	}