auth: Removed redundant noauthenticate checks.

Now that noauthenticate also adds nopassword field.

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index f3de47e6105ff83661f424598dd54bc2b2fa0b54..dfeaa83fdad4dc47be03cdf391e338a24e6e8d6e 100644 (file)
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -2280,8 +2280,7 @@ int auth_request_password_verify(struct auth_request *request,
                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 --git a/src/auth/passdb-sql.c b/src/auth/passdb-sql.c
index d3f391211a3b8ffc41fe64ab20843cd4334bf2d0..81a3ba61dc439b0467e341777812cbc04bcd9369 100644 (file)
--- a/src/auth/passdb-sql.c
+++ b/src/auth/passdb-sql.c
@@ -99,8 +99,7 @@ static void sql_query_callback(struct sql_result *result,
                        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;