auth: Internal passdb failures were always failing the request even if another passdb...

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 847661f0de5e2d203e75318cbc44931f9d7f1934..adbc4198cc41b97facd609447bdda445972e4c93 100644 (file)
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -651,14 +651,14 @@ auth_request_handle_passdb_callback(enum passdb_result *result,
                        request->passdbs_seen_internal_failure = TRUE;
                }
                return FALSE;
+       } else if (request->passdb_success) {
+               /* either this or a previous passdb lookup succeeded. */
+               *result = PASSDB_RESULT_OK;
        } else if (request->passdbs_seen_internal_failure) {
                /* last passdb lookup returned internal failure. it may have
                   had the correct password, so return internal failure
                   instead of plain failure. */
                *result = PASSDB_RESULT_INTERNAL_FAILURE;
-       } else if (request->passdb_success) {
-               /* either this or a previous passdb lookup succeeded. */
-               *result = PASSDB_RESULT_OK;
        }
        return TRUE;
 }