Mercurial > dovecot > core-2.2

changeset 5412:79187982328f HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If "nopassword" is set, don't crash if password is non-NULL. However give an error if the password is non-empty.
author Timo Sirainen <tss@iki.fi>
date Sun, 25 Mar 2007 21:31:37 +0300
parents bea1e1bab54a
children 874210e30dba
files src/auth/auth-request.c
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/auth-request.c	Sun Mar 25 21:27:16 2007 +0300
+++ b/src/auth/auth-request.c	Sun Mar 25 21:31:37 2007 +0300
@@ -949,8 +949,15 @@
 		request->no_failure_delay = TRUE;
 	} else if (strcmp(name, "nopassword") == 0) {
 		/* NULL password - anything goes */
-		i_assert(request->passdb_password == NULL);
+		if (request->passdb_password != NULL &&
+		    *request->passdb_password != '\0') {
+			auth_request_log_error(request,
+				request->passdb->passdb->iface.name,
+				"nopassword set but password is non-empty");
+			return;
+		}
 		request->no_password = TRUE;
+		request->passdb_password = NULL;
 	} else if (strcmp(name, "allow_nets") == 0) {
 		auth_request_validate_networks(request, value);
 	} else {