From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Fri, 31 Aug 2018 06:20:16 +0000 (+0300)
Subject: auth: Add db_ prefix to sql in db-sql
X-Git-Tag: 2.3.4~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=198bb843d94de1278ed1851b2c95ee07df841965;p=thirdparty%2Fdovecot%2Fcore.git

auth: Add db_ prefix to sql in db-sql

Prevents clash with lib-sql
---

diff --git a/src/auth/db-sql.c b/src/auth/db-sql.c
index 16c499a403..698f95e5b7 100644
--- a/src/auth/db-sql.c
+++ b/src/auth/db-sql.c
@@ -11,9 +11,9 @@
 
 #include <stddef.h>
 
-#define DEF_STR(name) DEF_STRUCT_STR(name, sql_settings)
-#define DEF_INT(name) DEF_STRUCT_INT(name, sql_settings)
-#define DEF_BOOL(name) DEF_STRUCT_BOOL(name, sql_settings)
+#define DEF_STR(name) DEF_STRUCT_STR(name, db_sql_settings)
+#define DEF_INT(name) DEF_STRUCT_INT(name, db_sql_settings)
+#define DEF_BOOL(name) DEF_STRUCT_BOOL(name, db_sql_settings)
 
 static struct setting_def setting_defs[] = {
 	DEF_STR(driver),
@@ -28,7 +28,7 @@ static struct setting_def setting_defs[] = {
 	{ 0, NULL, 0 }
 };
 
-static struct sql_settings default_sql_settings = {
+static struct db_sql_settings default_db_sql_settings = {
 	.driver = NULL,
 	.connect = NULL,
 	.password_query = "SELECT username, domain, password FROM users WHERE username = '%n' AND domain = '%d'",
@@ -39,11 +39,11 @@ static struct sql_settings default_sql_settings = {
 	.userdb_warning_disable = FALSE
 };
 
-static struct sql_connection *connections = NULL;
+static struct db_sql_connection *connections = NULL;
 
-static struct sql_connection *sql_conn_find(const char *config_path)
+static struct db_sql_connection *sql_conn_find(const char *config_path)
 {
-	struct sql_connection *conn;
+	struct db_sql_connection *conn;
 
 	for (conn = connections; conn != NULL; conn = conn->next) {
 		if (strcmp(conn->config_path, config_path) == 0)
@@ -54,15 +54,15 @@ static struct sql_connection *sql_conn_find(const char *config_path)
 }
 
 static const char *parse_setting(const char *key, const char *value,
-				 struct sql_connection *conn)
+				 struct db_sql_connection *conn)
 {
 	return parse_setting_from_defs(conn->pool, setting_defs,
 				       &conn->set, key, value);
 }
 
-struct sql_connection *db_sql_init(const char *config_path, bool userdb)
+struct db_sql_connection *db_sql_init(const char *config_path, bool userdb)
 {
-	struct sql_connection *conn;
+	struct db_sql_connection *conn;
 	const char *error;
 	pool_t pool;
 
@@ -77,25 +77,25 @@ struct sql_connection *db_sql_init(const char *config_path, bool userdb)
 	if (*config_path == '\0')
 		i_fatal("sql: Configuration file path not given");
 
-	pool = pool_alloconly_create("sql_connection", 1024);
-	conn = p_new(pool, struct sql_connection, 1);
+	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;
 
 	conn->config_path = p_strdup(pool, config_path);
-	conn->set = default_sql_settings;
+	conn->set = default_db_sql_settings;
 	if (!settings_read_nosection(config_path, parse_setting, conn, &error))
 		i_fatal("sql %s: %s", config_path, error);
 
-	if (conn->set.password_query == default_sql_settings.password_query)
+	if (conn->set.password_query == default_db_sql_settings.password_query)
 		conn->default_password_query = TRUE;
-	if (conn->set.user_query == default_sql_settings.user_query)
+	if (conn->set.user_query == default_db_sql_settings.user_query)
 		conn->default_user_query = TRUE;
-	if (conn->set.update_query == default_sql_settings.update_query)
+	if (conn->set.update_query == default_db_sql_settings.update_query)
 		conn->default_update_query = TRUE;
-	if (conn->set.iterate_query == default_sql_settings.iterate_query)
+	if (conn->set.iterate_query == default_db_sql_settings.iterate_query)
 		conn->default_iterate_query = TRUE;
 
 	if (conn->set.driver == NULL) {
@@ -113,9 +113,9 @@ struct sql_connection *db_sql_init(const char *config_path, bool userdb)
 	return conn;
 }
 
-void db_sql_unref(struct sql_connection **_conn)
+void db_sql_unref(struct db_sql_connection **_conn)
 {
-        struct sql_connection *conn = *_conn;
+        struct db_sql_connection *conn = *_conn;
 
 	/* abort all pending auth requests before setting conn to NULL,
 	   so that callbacks can still access it */
@@ -129,7 +129,7 @@ void db_sql_unref(struct sql_connection **_conn)
 	pool_unref(&conn->pool);
 }
 
-void db_sql_connect(struct sql_connection *conn)
+void db_sql_connect(struct db_sql_connection *conn)
 {
 	if (sql_connect(conn->db) < 0 && worker) {
 		/* auth worker's sql connection failed. we can't do anything
@@ -142,25 +142,25 @@ void db_sql_connect(struct sql_connection *conn)
 	}
 }
 
-void db_sql_success(struct sql_connection *conn ATTR_UNUSED)
+void db_sql_success(struct db_sql_connection *conn ATTR_UNUSED)
 {
 	if (worker)
 		auth_worker_client_send_success();
 }
 
-void db_sql_check_userdb_warning(struct sql_connection *conn)
+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_sql_settings.user_query) != 0) {
+		   default_db_sql_settings.user_query) != 0) {
 		i_warning("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_sql_settings.iterate_query) != 0) {
+			  default_db_sql_settings.iterate_query) != 0) {
 		i_warning("sql: Ignoring changed iterate_query in %s, "
 			  "because userdb sql not used. "
 			  "(If this is intentional, set userdb_warning_disable=yes)",
diff --git a/src/auth/db-sql.h b/src/auth/db-sql.h
index e985f1d5e5..27e177be75 100644
--- a/src/auth/db-sql.h
+++ b/src/auth/db-sql.h
@@ -3,7 +3,7 @@
 
 #include "sql-api.h"
 
-struct sql_settings {
+struct db_sql_settings {
 	const char *driver;
 	const char *connect;
 	const char *password_query;
@@ -14,14 +14,14 @@ struct sql_settings {
 	bool userdb_warning_disable;
 };
 
-struct sql_connection {
-	struct sql_connection *next;
+struct db_sql_connection {
+	struct db_sql_connection *next;
 
 	pool_t pool;
 	int refcount;
 
 	char *config_path;
-	struct sql_settings set;
+	struct db_sql_settings set;
 	struct sql_db *db;
 
 	bool default_password_query:1;
@@ -31,12 +31,12 @@ struct sql_connection {
 	bool userdb_used:1;
 };
 
-struct sql_connection *db_sql_init(const char *config_path, bool userdb);
-void db_sql_unref(struct sql_connection **conn);
+struct db_sql_connection *db_sql_init(const char *config_path, bool userdb);
+void db_sql_unref(struct db_sql_connection **conn);
 
-void db_sql_connect(struct sql_connection *conn);
-void db_sql_success(struct 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 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 1dcba5eb97..3c16c82f59 100644
--- a/src/auth/passdb-sql.c
+++ b/src/auth/passdb-sql.c
@@ -15,7 +15,7 @@
 struct sql_passdb_module {
 	struct passdb_module module;
 
-	struct sql_connection *conn;
+	struct db_sql_connection *conn;
 };
 
 struct passdb_sql_request {
@@ -262,7 +262,7 @@ static struct passdb_module *
 passdb_sql_preinit(pool_t pool, const char *args)
 {
 	struct sql_passdb_module *module;
-	struct sql_connection *conn;
+	struct db_sql_connection *conn;
 
 	module = p_new(pool, struct sql_passdb_module, 1);
 	module->conn = conn = db_sql_init(args, FALSE);
diff --git a/src/auth/userdb-sql.c b/src/auth/userdb-sql.c
index aef1565448..d4ae899142 100644
--- a/src/auth/userdb-sql.c
+++ b/src/auth/userdb-sql.c
@@ -13,7 +13,7 @@
 struct sql_userdb_module {
 	struct userdb_module module;
 
-	struct sql_connection *conn;
+	struct db_sql_connection *conn;
 };
 
 struct userdb_sql_request {