lib-storage: Change mail_access_groups default to $SET:default_internal_group

diff --git a/src/lib-settings/settings-history-core.txt b/src/lib-settings/settings-history-core.txt
index bdec3c7747c37c90a33530d51473991f8f4f1d6b..eb30e8c3d8cbf7348eda12b89de92ff2fac37537 100644 (file)
--- a/src/lib-settings/settings-history-core.txt
+++ b/src/lib-settings/settings-history-core.txt
@@ -1,3 +1,4 @@
+default        mail_access_groups              2.4.3   3.2.0
 default        mail_attachment_detection_options               2.4.2   3.2.0
 default        @metric_defaults/proxy/metric   auth_successes,auth_failures,login_aborted      2.4.2   3.2.0
 default        fts_search_read_fallback        yes     -       3.2.0

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index b6536c04987189274a58406a9f3cd10cd12dd38f..dc278442dc1fd71cefc8a047c24dca90f83c6cd7 100644 (file)
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -443,11 +443,17 @@ static const struct mail_user_settings mail_user_default_settings = {
        .postmaster_address = "postmaster@%{user|domain|default(hostname)}",
 };
 
+static const struct setting_keyvalue mail_user_default_settings_keyvalue[] = {
+       { "mail_access_groups", "$SET:default_internal_group" },
+
+       { NULL, NULL }
+};
 const struct setting_parser_info mail_user_setting_parser_info = {
        .name = "mail_user",
 
        .defines = mail_user_setting_defines,
        .defaults = &mail_user_default_settings,
+       .default_settings = mail_user_default_settings_keyvalue,
 
        .struct_size = sizeof(struct mail_user_settings),
        .pool_offset1 = 1 + offsetof(struct mail_user_settings, pool),