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 fa14e510fe7ebf2067f55e7b70f82f89de0bbec8..953dd32b1a8d76af697987ec7b1cee3b35942615 100644 (file)
--- 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 b1834d613efe5a3f0c583405f3c12f048931086d..81e5401da341e09e1acba8f021925f9f8758a095 100644 (file)
--- 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 2d19f15d1bdca768d6caf2a5ffd0633b0f1bc0cc..0658ba0723b084afc1269168e19c94244bb80741 100644 (file)
--- 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 48580d2e1cf1aa033549ab50acad6a4ab045f163..38aa9ff802fc6b67bffc011941efed62f3db3b6d 100644 (file)
--- 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);