From: Karl Fleischmann <karl.fleischmann@open-xchange.com>
Date: Tue, 1 Jul 2025 13:00:57 +0000 (+0200)
Subject: lib-storage: mail_storage_settings_ext_check() - Add warning for deprecated mailbox_d... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86175fea9d8d31d269ff45d67e136e4004bcf67f;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: mail_storage_settings_ext_check() - Add warning for deprecated mailbox_directory_name_legacy setting
---

diff --git a/src/config/settings-get.pl b/src/config/settings-get.pl
index 6cbf542b04..1937e9e8b3 100755
--- a/src/config/settings-get.pl
+++ b/src/config/settings-get.pl
@@ -23,9 +23,11 @@ print '#include "unichar.h"'."\n";
 print '#include "uri-util.h"'."\n";
 print '#include "hash-method.h"'."\n";
 print '#include "settings.h"'."\n";
+print '#include "master-interface.h"'."\n";
 print '#include "message-header-parser.h"'."\n";
 print '#include "imap-urlauth-worker-common.h"'."\n";
 print '#include "mailbox-list.h"'."\n";
+print '#include "doc.h"'."\n";
 print '#include "all-settings.h"'."\n";
 print '#include <unistd.h>'."\n";
 print '#define CONFIG_BINARY'."\n";
diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index 23db4f0f0e..3a09bb4cfe 100644
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -15,7 +15,9 @@
 #include "mail-namespace.h"
 #include "mail-storage-private.h"
 #include "mail-storage-settings.h"
+#include "master-interface.h"
 #include "iostream-ssl.h"
+#include "doc.h"
 
 static bool mail_storage_settings_apply(struct event *event, void *_set, const char *key, const char **value, enum setting_apply_flags, const char **error_r);
 static bool mail_storage_settings_ext_check(struct event *event, void *_set, pool_t pool, const char **error_r);
@@ -592,8 +594,8 @@ mail_storage_settings_apply(struct event *event ATTR_UNUSED, void *_set,
 }
 
 static bool
-mail_storage_settings_ext_check(struct event *event ATTR_UNUSED,
-				void *_set, pool_t pool, const char **error_r)
+mail_storage_settings_ext_check(struct event *event, void *_set, pool_t pool,
+				const char **error_r)
 {
 	struct mail_storage_settings *set = _set;
 	struct hash_format *format;
@@ -791,6 +793,14 @@ mail_storage_settings_ext_check(struct event *event ATTR_UNUSED,
 				set->mail_path, set->mail_inbox_path);
 		}
 	}
+
+	if (getenv(MASTER_IS_PARENT_ENV) != NULL &&
+	    set->mailbox_directory_name_legacy) {
+		e_warning(event,
+			  "mailbox_directory_name_legacy=yes has been deprecated and will eventually be removed. See "
+			  DOC_LINK("core/config/mailbox_formats/dbox.html#migrating-away-from-mailbox-directory-name-legacy")
+			  " for an upgrade guide.");
+	}
 	return TRUE;
 }