From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 13 Apr 2023 20:49:43 +0000 (+0300)
Subject: global: Use more specific events for settings lookups
X-Git-Tag: 2.4.0~2182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1f9571ab01cfe25035e186b6ece59a6a2b3cb3a;p=thirdparty%2Fdovecot%2Fcore.git

global: Use more specific events for settings lookups
---

diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index 7e4b7f3233..1c1bcbb45e 100644
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -1022,7 +1022,9 @@ get_default_replica_location(struct dsync_cmd_context *ctx,
 	struct master_service_settings_instance *set_instance =
 		mail_storage_service_user_get_settings_instance(service_user);
 	const struct mail_storage_settings *mail_set;
-	if (master_service_settings_instance_get(NULL, set_instance,
+	if (master_service_settings_instance_get(
+			mail_storage_service_user_get_event(service_user),
+			set_instance,
 			&mail_storage_setting_parser_info,
 			MASTER_SERVICE_SETTINGS_GET_FLAG_NO_CHECK |
 			MASTER_SERVICE_SETTINGS_GET_FLAG_NO_EXPAND,
diff --git a/src/imap-urlauth/imap-urlauth-worker.c b/src/imap-urlauth/imap-urlauth-worker.c
index 1be86f83d2..e322958ca1 100644
--- a/src/imap-urlauth/imap-urlauth-worker.c
+++ b/src/imap-urlauth/imap-urlauth-worker.c
@@ -559,7 +559,7 @@ client_handle_user_command(struct client *client, const char *cmd,
 		return 1;
 	}
 
-	if (master_service_settings_instance_get(client->event,
+	if (master_service_settings_instance_get(mail_user->event,
 			mail_user->set_instance,
 			&imap_urlauth_worker_setting_parser_info, 0,
 			&set, &error) < 0) {
diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index d3590f8e9e..3bfc281f95 100644
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -346,7 +346,9 @@ int lmtp_local_rcpt(struct client *client,
 
 	struct master_service_settings_instance *set_instance =
 		mail_storage_service_user_get_settings_instance(service_user);
-	if (master_service_settings_instance_get(rcpt->event, set_instance,
+	if (master_service_settings_instance_get(
+			mail_storage_service_user_get_event(service_user),
+			set_instance,
 			&lda_setting_parser_info,
 			0, &llrcpt->lda_set, &error) < 0) {
 		e_error(rcpt->event, "%s", error);
@@ -445,7 +447,9 @@ lmtp_local_deliver(struct lmtp_local *local,
 	username = t_strdup(input->username);
 
 	set_instance = mail_storage_service_user_get_settings_instance(service_user);
-	if (master_service_settings_instance_get(rcpt->event, set_instance,
+	if (master_service_settings_instance_get(
+			mail_storage_service_user_get_event(service_user),
+			set_instance,
 			&mail_storage_setting_parser_info,
 			MASTER_SERVICE_SETTINGS_GET_FLAG_NO_EXPAND,
 			&mail_set, &error) < 0) {