Mercurial > dovecot > core-2.2

changeset 8568:935930abeb7a HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
LDAP: Allow empty/missing password field if nopassword field is given.
author Timo Sirainen <tss@iki.fi>
date Fri, 19 Dec 2008 06:23:31 +0200
parents c6facf63c7f9
children 5eb05134db86
files src/auth/passdb-ldap.c
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/passdb-ldap.c	Thu Dec 18 19:34:35 2008 +0200
+++ b/src/auth/passdb-ldap.c	Fri Dec 19 06:23:31 2008 +0200
@@ -109,16 +109,13 @@
 	password = NULL;
 
 	ldap_query_save_result(conn, entry, auth_request);
-	if (auth_request->passdb_password == NULL) {
-		auth_request_log_error(auth_request, "ldap",
-				       "No password in reply");
-	} else if (ldap_next_entry(conn->ld, entry) != NULL) {
+	if (ldap_next_entry(conn->ld, entry) != NULL) {
 		auth_request_log_error(auth_request, "ldap",
 			"pass_filter matched multiple objects, aborting");
 	} else if (auth_request->passdb_password == NULL &&
 		   !auth_request->no_password) {
 		auth_request_log_info(auth_request, "ldap",
-			"Empty password returned without nopassword");
+			"No password returned (and no nopassword)");
 		passdb_result = PASSDB_RESULT_PASSWORD_MISMATCH;
 	} else {
 		/* passdb_password may change on the way,