From c618a99c4ba410bbb3b8ee200734ffe34ab6554f Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 11 Jan 2024 10:34:51 -0500
Subject: [PATCH] auth: Remove deprecated passdb_pass setting

---
 src/auth/auth-settings.c |  8 +-------
 src/auth/auth-settings.h |  1 -
 src/auth/auth.c          | 10 ++--------
 src/auth/test-mock.c     |  2 --
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index 5eaa1c5e87..26d5987921 100644
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -117,7 +117,6 @@ static const struct setting_define auth_passdb_setting_defines[] = {
 	DEF(ENUM, result_internalfail),
 
 	DEF(BOOL, deny),
-	DEF(BOOL, pass),
 	DEF(BOOL, master),
 	DEF(ENUM, auth_verbose),
 
@@ -139,7 +138,6 @@ static const struct auth_passdb_settings auth_passdb_default_settings = {
 	.result_internalfail = "continue:return:return-ok:return-fail:continue-ok:continue-fail",
 
 	.deny = FALSE,
-	.pass = FALSE,
 	.master = FALSE,
 	.auth_verbose = "default:yes:no"
 };
@@ -550,16 +548,12 @@ static bool auth_settings_ext_check(struct event *event, void *_set,
 
 static bool
 auth_passdb_settings_check(void *_set, pool_t pool ATTR_UNUSED,
-			   const char **error_r)
+			   const char **error_r ATTR_UNUSED)
 {
 	struct auth_passdb_settings *set = _set;
 
 	if (*set->driver == '\0')
 		return TRUE;
-	if (set->pass && strcmp(set->result_success, "return-ok") != 0) {
-		*error_r = "Obsolete pass=yes setting mixed with non-default result_success";
-		return FALSE;
-	}
 	return TRUE;
 }
 /* </settings checks> */
diff --git a/src/auth/auth-settings.h b/src/auth/auth-settings.h
index 7d7df2d0ab..0c72d0fe44 100644
--- a/src/auth/auth-settings.h
+++ b/src/auth/auth-settings.h
@@ -19,7 +19,6 @@ struct auth_passdb_settings {
 	const char *result_failure;
 	const char *result_internalfail;
 	bool deny;
-	bool pass; /* deprecated, use result_success=continue instead */
 	bool master;
 	const char *auth_verbose;
 };
diff --git a/src/auth/auth.c b/src/auth/auth.c
index 3f99d5ac1f..275d790925 100644
--- a/src/auth/auth.c
+++ b/src/auth/auth.c
@@ -113,10 +113,6 @@ auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *set,
 				set->username_filter, " ,");
 	}
 
-	/* for backwards compatibility: */
-	if (set->pass)
-		auth_passdb->result_success = AUTH_DB_RULE_CONTINUE;
-
 	for (dest = passdbs; *dest != NULL; dest = &(*dest)->next) ;
 	*dest = auth_passdb;
 
@@ -292,8 +288,7 @@ auth_preinit(const struct auth_settings *set, const char *protocol,
 		last_passdb = i;
 	}
 	if (passdb_count != 0 &&
-	    (passdbs[last_passdb]->pass ||
-	     strcmp(passdbs[last_passdb]->result_success, "continue") == 0))
+	     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++) {
@@ -308,8 +303,7 @@ auth_preinit(const struct auth_settings *set, const char *protocol,
 		if (passdbs[i]->deny)
 			i_fatal("Master passdb can't have deny=yes");
 		if (passdb_count == 0 &&
-		    (passdbs[i]->pass ||
-		     strcmp(passdbs[i]->result_success, "continue") == 0)) {
+		    strcmp(passdbs[i]->result_success, "continue") == 0) {
 			i_fatal("Master passdb can't have result_success=continue "
 				"if there are no passdbs");
 		}
diff --git a/src/auth/test-mock.c b/src/auth/test-mock.c
index 0c290d44d1..22dfc7f089 100644
--- a/src/auth/test-mock.c
+++ b/src/auth/test-mock.c
@@ -56,7 +56,6 @@ struct auth_passdb_settings mock_passdb_set = {
 	.result_failure = "continue",
 	.result_internalfail = "continue",
 	.deny = FALSE,
-	.pass = FALSE,
 	.master = FALSE,
 	.auth_verbose = "default"
 };
@@ -85,7 +84,6 @@ void passdb_mock_mod_init(void)
 		.result_internalfail = "continue",
 
 		.deny = FALSE,
-		.pass = FALSE,
 		.master = FALSE,
 		.auth_verbose = "default"
 	};
-- 
2.47.3