From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 4 Jan 2023 22:57:47 +0000 (+0200)
Subject: auth: Change auth settings structs to be const
X-Git-Tag: 2.4.0~2350
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d0f57fb5f53eeed6fac6a5cc3e772087dc7bc12;p=thirdparty%2Fdovecot%2Fcore.git

auth: Change auth settings structs to be const
---

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index 973aae1038..56a10374b8 100644
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -550,9 +550,9 @@ auth_userdb_settings_check(void *_set, pool_t pool ATTR_UNUSED,
 }
 /* </settings checks> */
 
-struct auth_settings *global_auth_settings;
+const struct auth_settings *global_auth_settings;
 
-struct auth_settings *
+const struct auth_settings *
 auth_settings_read(const char *service, pool_t pool,
 		   struct master_service_settings_output *output_r)
 {
diff --git a/src/auth/auth-settings.h b/src/auth/auth-settings.h
index 08d696e2b9..26bbcf37ad 100644
--- a/src/auth/auth-settings.h
+++ b/src/auth/auth-settings.h
@@ -98,9 +98,9 @@ struct auth_settings {
 };
 
 extern const struct setting_parser_info auth_setting_parser_info;
-extern struct auth_settings *global_auth_settings;
+extern const struct auth_settings *global_auth_settings;
 
-struct auth_settings *
+const struct auth_settings *
 auth_settings_read(const char *service, pool_t pool,
 		   struct master_service_settings_output *output_r)
 	ATTR_NULL(1);
diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c
index d574e78ae8..0bb3696c69 100644
--- a/src/auth/test-mech.c
+++ b/src/auth/test-mech.c
@@ -94,8 +94,8 @@ static void test_mechs_init(void)
 
 	/* Copy default settings */
 	set = *(const struct auth_settings *)auth_setting_parser_info.defaults;
+	set.base_dir = ".";
 	global_auth_settings = &set;
-	global_auth_settings->base_dir = ".";
 	memset((&set)->username_chars_map, 1, sizeof((&set)->username_chars_map));
 	set.username_format = "";
 
@@ -133,7 +133,7 @@ static void test_mech_prepare_request(struct auth_request **request_r,
 				      unsigned int running_test,
 				      const struct test_case *test_case)
 {
-	global_auth_settings->ssl_username_from_cert = test_case->set_cert_username;
+	set.ssl_username_from_cert = test_case->set_cert_username;
 	struct auth *auth = auth_default_service();
 
 	struct auth_request *request = auth_request_new(mech,  NULL);