From: Timo Sirainen Date: Thu, 11 Jan 2024 15:33:25 +0000 (-0500) Subject: auth: Update deprecated passdb_pass checks to check also passdb_result_success=continue X-Git-Tag: 2.4.1~1114 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e49c9822fae60847c7a3678dc99fc91a54a8656;p=thirdparty%2Fdovecot%2Fcore.git auth: Update deprecated passdb_pass checks to check also passdb_result_success=continue --- diff --git a/src/auth/auth.c b/src/auth/auth.c index f086d57d06..3f99d5ac1f 100644 --- a/src/auth/auth.c +++ b/src/auth/auth.c @@ -291,8 +291,10 @@ auth_preinit(const struct auth_settings *set, const char *protocol, passdb_count++; last_passdb = i; } - if (passdb_count != 0 && passdbs[last_passdb]->pass) - i_fatal("Last passdb can't have pass=yes"); + if (passdb_count != 0 && + (passdbs[last_passdb]->pass || + strcmp(passdbs[last_passdb]->result_success, "continue") == 0)) + i_fatal("Last passdb can't have result_success=continue"); for (i = 0; i < db_count; i++) { if (!passdbs[i]->master) @@ -305,8 +307,10 @@ auth_preinit(const struct auth_settings *set, const char *protocol, if (passdbs[i]->deny) i_fatal("Master passdb can't have deny=yes"); - if (passdbs[i]->pass && passdb_count == 0) { - i_fatal("Master passdb can't have pass=yes " + if (passdb_count == 0 && + (passdbs[i]->pass || + strcmp(passdbs[i]->result_success, "continue") == 0)) { + i_fatal("Master passdb can't have result_success=continue " "if there are no passdbs"); } auth_passdb_preinit(auth, passdbs[i], &auth->masterdbs);