From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Fri, 26 Jan 2024 11:46:39 +0000 (+0200)
Subject: lib-storage: Use SETTINGS_EVENT_NAMESPACE_NAME in mail events
X-Git-Tag: 2.4.1~1149
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cd0a45ae5286ba8f7cd0c6ea84f6436b2346d99;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Use SETTINGS_EVENT_NAMESPACE_NAME in mail events
---

diff --git a/src/lib-storage/index/shared/shared-storage.c b/src/lib-storage/index/shared/shared-storage.c
index 5efa572623..ed03c9e913 100644
--- a/src/lib-storage/index/shared/shared-storage.c
+++ b/src/lib-storage/index/shared/shared-storage.c
@@ -343,7 +343,7 @@ shared_mail_user_init(struct mail_storage *_storage,
 	};
 
 	struct event *set_event = event_create(user->event);
-	event_add_str(set_event, "namespace", ns->set->name);
+	event_add_str(set_event, SETTINGS_EVENT_NAMESPACE_NAME, ns->set->name);
 	event_set_ptr(set_event, SETTINGS_EVENT_VAR_EXPAND_TABLE, tab);
 	event_set_ptr(set_event, SETTINGS_EVENT_VAR_EXPAND_FUNC_TABLE,
 		      func_tab);
diff --git a/src/lib-storage/mail-namespace.c b/src/lib-storage/mail-namespace.c
index 604ea74886..e5218344be 100644
--- a/src/lib-storage/mail-namespace.c
+++ b/src/lib-storage/mail-namespace.c
@@ -457,7 +457,7 @@ int mail_namespaces_init(struct mail_user *user, const char **error_r)
 		count = 0;
 	}
 	for (i = 0; i < count; i++) {
-		if (settings_get_filter(user->event, "namespace", ns_names[i],
+		if (settings_get_filter(user->event, SETTINGS_EVENT_NAMESPACE_NAME, ns_names[i],
 					&mail_namespace_setting_parser_info,
 					0, &ns_set, &error) < 0) {
 			*error_r = t_strdup_printf(
@@ -471,7 +471,7 @@ int mail_namespaces_init(struct mail_user *user, const char **error_r)
 		}
 
 		struct event *set_event = event_create(user->event);
-		event_add_str(set_event, "namespace", ns_names[i]);
+		event_add_str(set_event, SETTINGS_EVENT_NAMESPACE_NAME, ns_names[i]);
 
 		if (mail_namespaces_init_add(user, set_event, ns_set,
 					     ns_p, error_r) < 0) {
diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 2aafc3417d..43144ff183 100644
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -342,8 +342,8 @@ mail_storage_create_list(struct mail_namespace *ns,
 	/* Set namespace, but don't overwrite if it already is set.
 	   Shared storage uses the same shared namespace here also for the
 	   user's root prefix="" namespace. */
-	if (event_find_field_recursive(set_event, "namespace") == NULL)
-		event_add_str(set_event, "namespace", ns->set->name);
+	if (event_find_field_recursive(set_event, SETTINGS_EVENT_NAMESPACE_NAME) == NULL)
+		event_add_str(set_event, SETTINGS_EVENT_NAMESPACE_NAME, ns->set->name);
 
 	if ((flags & MAIL_STORAGE_FLAG_SHARED_DYNAMIC) != 0) {
 		mail_storage_create_ns_instance(ns, set_event);
@@ -405,7 +405,7 @@ mail_storage_create_list(struct mail_namespace *ns,
 	}
 
 	struct event *event = event_create(ns->user->event);
-	event_add_str(event, "namespace", ns->set->name);
+	event_add_str(event, SETTINGS_EVENT_NAMESPACE_NAME, ns->set->name);
 	int ret = mailbox_list_create(event, ns, mail_set, list_flags,
 				      &list, error_r);
 	if (ret < 0) {
@@ -3461,7 +3461,7 @@ mail_storage_mailbox_create_event(struct event *parent,
 	event_add_str(event, SETTINGS_EVENT_MAILBOX_NAME_WITH_PREFIX, vname);
 	event_add_str(event, SETTINGS_EVENT_MAILBOX_NAME_WITHOUT_PREFIX,
 		      mailbox_get_name_without_prefix(list->ns, vname));
-	event_add_str(event, "namespace", list->ns->set->name);
+	event_add_str(event, SETTINGS_EVENT_NAMESPACE_NAME, list->ns->set->name);
 
 	event_drop_parent_log_prefixes(event, 1);
 	event_set_append_log_prefix(event, t_strdup_printf(
diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h
index af7e71b33d..9d480e8c1a 100644
--- a/src/lib-storage/mail-storage.h
+++ b/src/lib-storage/mail-storage.h
@@ -23,6 +23,11 @@ struct message_size;
 #define MAIL_KEYWORD_HAS_ATTACHMENT "$HasAttachment"
 #define MAIL_KEYWORD_HAS_NO_ATTACHMENT "$HasNoAttachment"
 
+/* The "namespace" event field contains the namespace containing mailbox.
+   For dynamic namespaces, the name is the one specified in configuration
+   for the template namespace. */
+#define SETTINGS_EVENT_NAMESPACE_NAME "namespace"
+
 enum mail_storage_flags {
 	/* Remember message headers' MD5 sum */
 	MAIL_STORAGE_FLAG_KEEP_HEADER_MD5	= 0x01,