From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 1 Mar 2024 11:17:31 +0000 (+0200)
Subject: auth: passdb sql - Remove warning about changed userdb queries without userdb sql
X-Git-Tag: 2.4.1~945
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3660a8b4f08b9e30424704f2cbfda77d603b48b;p=thirdparty%2Fdovecot%2Fcore.git

auth: passdb sql - Remove warning about changed userdb queries without userdb sql

This will no longer make sense after the upcoming settings changes.
---

diff --git a/src/auth/db-sql.c b/src/auth/db-sql.c
index fa14e510fe..953dd32b1a 100644
--- a/src/auth/db-sql.c
+++ b/src/auth/db-sql.c
@@ -22,7 +22,6 @@ static struct setting_def setting_defs[] = {
  	DEF_STR(update_query),
  	DEF_STR(iterate_query),
 	DEF_STR(default_pass_scheme),
-	DEF_BOOL(userdb_warning_disable),
 
 	{ 0, NULL, 0 }
 };
@@ -35,7 +34,6 @@ static struct db_sql_settings default_db_sql_settings = {
 	.update_query = "",
 	.iterate_query = "",
 	.default_pass_scheme = "MD5",
-	.userdb_warning_disable = FALSE
 };
 
 static struct db_sql_connection *connections = NULL;
@@ -59,7 +57,7 @@ static const char *parse_setting(const char *key, const char *value,
 				       &conn->set, key, value);
 }
 
-struct db_sql_connection *db_sql_init(const char *config_path, bool userdb)
+struct db_sql_connection *db_sql_init(const char *config_path)
 {
 	struct db_sql_connection *conn;
 	struct sql_legacy_settings set;
@@ -68,8 +66,6 @@ struct db_sql_connection *db_sql_init(const char *config_path, bool userdb)
 
 	conn = sql_conn_find(config_path);
 	if (conn != NULL) {
-		if (userdb)
-			conn->userdb_used = TRUE;
 		conn->refcount++;
 		return conn;
 	}
@@ -80,7 +76,6 @@ struct db_sql_connection *db_sql_init(const char *config_path, bool userdb)
 	pool = pool_alloconly_create("db_sql_connection", 1024);
 	conn = p_new(pool, struct db_sql_connection, 1);
 	conn->pool = pool;
-	conn->userdb_used = userdb;
 
 	conn->refcount = 1;
 
@@ -145,26 +140,4 @@ void db_sql_success(struct db_sql_connection *conn ATTR_UNUSED)
 		auth_worker_server_send_success();
 }
 
-void db_sql_check_userdb_warning(struct db_sql_connection *conn)
-{
-	if (worker || conn->userdb_used || conn->set.userdb_warning_disable)
-		return;
-
-	if (strcmp(conn->set.user_query,
-		   default_db_sql_settings.user_query) != 0) {
-		e_warning(auth_event,
-			  "sql: Ignoring changed user_query in %s, "
-			  "because userdb sql not used. "
-			  "(If this is intentional, set userdb_warning_disable=yes)",
-			  conn->config_path);
-	} else if (strcmp(conn->set.iterate_query,
-			  default_db_sql_settings.iterate_query) != 0) {
-		e_warning(auth_event,
-			  "sql: Ignoring changed iterate_query in %s, "
-			  "because userdb sql not used. "
-			  "(If this is intentional, set userdb_warning_disable=yes)",
-			  conn->config_path);
-	}
-}
-
 #endif
diff --git a/src/auth/db-sql.h b/src/auth/db-sql.h
index b1834d613e..81e5401da3 100644
--- a/src/auth/db-sql.h
+++ b/src/auth/db-sql.h
@@ -11,7 +11,6 @@ struct db_sql_settings {
 	const char *update_query;
 	const char *iterate_query;
 	const char *default_pass_scheme;
-	bool userdb_warning_disable;
 };
 
 struct db_sql_connection {
@@ -23,16 +22,12 @@ struct db_sql_connection {
 	char *config_path;
 	struct db_sql_settings set;
 	struct sql_db *db;
-
-	bool userdb_used:1;
 };
 
-struct db_sql_connection *db_sql_init(const char *config_path, bool userdb);
+struct db_sql_connection *db_sql_init(const char *config_path);
 void db_sql_unref(struct db_sql_connection **conn);
 
 void db_sql_connect(struct db_sql_connection *conn);
 void db_sql_success(struct db_sql_connection *conn);
 
-void db_sql_check_userdb_warning(struct db_sql_connection *conn);
-
 #endif
diff --git a/src/auth/passdb-sql.c b/src/auth/passdb-sql.c
index 2d19f15d1b..0658ba0723 100644
--- a/src/auth/passdb-sql.c
+++ b/src/auth/passdb-sql.c
@@ -247,7 +247,7 @@ passdb_sql_preinit(pool_t pool, const char *args)
 	struct db_sql_connection *conn;
 
 	module = p_new(pool, struct sql_passdb_module, 1);
-	module->conn = conn = db_sql_init(args, FALSE);
+	module->conn = conn = db_sql_init(args);
 
 	module->module.default_cache_key =
 		auth_cache_parse_key(pool, conn->set.password_query);
@@ -266,7 +266,6 @@ static void passdb_sql_init(struct passdb_module *_module)
 
 	if (!module->module.blocking || worker)
 		db_sql_connect(module->conn);
-	db_sql_check_userdb_warning(module->conn);
 }
 
 static void passdb_sql_deinit(struct passdb_module *_module)
diff --git a/src/auth/userdb-sql.c b/src/auth/userdb-sql.c
index 48580d2e1c..38aa9ff802 100644
--- a/src/auth/userdb-sql.c
+++ b/src/auth/userdb-sql.c
@@ -254,7 +254,7 @@ userdb_sql_preinit(pool_t pool, const char *args)
 	struct sql_userdb_module *module;
 
 	module = p_new(pool, struct sql_userdb_module, 1);
-	module->conn = db_sql_init(args, TRUE);
+	module->conn = db_sql_init(args);
 
 	module->module.default_cache_key =
 		auth_cache_parse_key(pool, module->conn->set.user_query);