From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sat, 8 Mar 2025 08:07:58 +0000 (+0200)
Subject: lib-storage: mail_user_lock_file_create() - Use mail_set from mailbox_list
X-Git-Tag: 2.4.1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e82cd412f8ffdf4ae75abd7b2348c7da46b7d899;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: mail_user_lock_file_create() - Use mail_set from mailbox_list

It was partially being used, while other settings were from user's mail_set.
---

diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c
index b6735b8bb5..5776de6335 100644
--- a/src/lib-storage/mail-user.c
+++ b/src/lib-storage/mail-user.c
@@ -504,16 +504,14 @@ int mail_user_lock_file_create(struct mail_user *user, const char *lock_fname,
 		return -1;
 	}
 
-	const struct mail_storage_settings *mail_set =
-		mail_user_set_get_storage_set(user);
+	struct mailbox_list *inbox_list =
+		mail_namespace_find_inbox(user->namespaces)->list;
 	struct file_create_settings lock_set = {
 		.lock_timeout_secs = lock_secs,
 		.lock_settings = {
-			.lock_method = mail_set->parsed_lock_method,
+			.lock_method = inbox_list->mail_set->parsed_lock_method,
 		},
 	};
-	struct mailbox_list *inbox_list =
-		mail_namespace_find_inbox(user->namespaces)->list;
 	if (inbox_list->mail_set->mail_volatile_path[0] == '\0')
 		path = t_strdup_printf("%s/%s", home, lock_fname);
 	else {
@@ -522,7 +520,8 @@ int mail_user_lock_file_create(struct mail_user *user, const char *lock_fname,
 				lock_fname);
 		lock_set.mkdir_mode = 0700;
 	}
-	return mail_storage_lock_create(path, &lock_set, mail_set, lock_r, error_r);
+	return mail_storage_lock_create(path, &lock_set, inbox_list->mail_set,
+					lock_r, error_r);
 }
 
 void mail_user_get_anvil_session(struct mail_user *user,