# HG changeset patch
# User Timo Sirainen <timo.sirainen@dovecot.fi>
# Date 1470838521 -10800
# Node ID 66a4f25b9e0e14ac0922a7cdd902cab55a0e9da9
# Parent  533591bab96989ad3a7dea90869a93137378cf74
auth: Removed redundant noauthenticate checks.

Now that noauthenticate also adds nopassword field.

diff -r 533591bab969 -r 66a4f25b9e0e src/auth/auth-request.c
--- a/src/auth/auth-request.c	Wed Aug 10 17:14:28 2016 +0300
+++ b/src/auth/auth-request.c	Wed Aug 10 17:15:21 2016 +0300
@@ -2280,8 +2280,7 @@
 		return 0;
 	}
 
-	if (auth_fields_exists(request->extra_fields, "nopassword") ||
-	    auth_fields_exists(request->extra_fields, "noauthenticate")) {
+	if (auth_fields_exists(request->extra_fields, "nopassword")) {
 		auth_request_log_debug(request, subsystem,
 					"Allowing any password");
 		return 1;
diff -r 533591bab969 -r 66a4f25b9e0e src/auth/passdb-sql.c
--- a/src/auth/passdb-sql.c	Wed Aug 10 17:14:28 2016 +0300
+++ b/src/auth/passdb-sql.c	Wed Aug 10 17:15:21 2016 +0300
@@ -99,8 +99,7 @@
 			auth_request_log_error(auth_request, AUTH_SUBSYS_DB,
 				"Password query returned multiple matches");
 		} else if (auth_request->passdb_password == NULL &&
-			   !auth_fields_exists(auth_request->extra_fields, "nopassword") &&
-			   !auth_fields_exists(auth_request->extra_fields, "noauthenticate")) {
+			   !auth_fields_exists(auth_request->extra_fields, "nopassword")) {
 			auth_request_log_info(auth_request, AUTH_SUBSYS_DB,
 				"Empty password returned without nopassword");
 			passdb_result = PASSDB_RESULT_PASSWORD_MISMATCH;