dovecot-1.1: LDAP: Allow empty/missing password field if nopassw...
dovecot at dovecot.org
dovecot at dovecot.org
Fri Dec 19 06:23:38 EET 2008
details: http://hg.dovecot.org/dovecot-1.1/rev/a47ddd8a67a4
changeset: 8056:a47ddd8a67a4
user: Timo Sirainen <tss at iki.fi>
date: Fri Dec 19 06:23:18 2008 +0200
description:
LDAP: Allow empty/missing password field if nopassword field is given.
diffstat:
1 file changed, 2 insertions(+), 5 deletions(-)
src/auth/passdb-ldap.c | 7 ++-----
diffs (22 lines):
diff -r 4152cda041de -r a47ddd8a67a4 src/auth/passdb-ldap.c
--- 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:18 2008 +0200
@@ -109,16 +109,13 @@ ldap_lookup_pass_callback(struct ldap_co
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,
More information about the dovecot-cvs
mailing list