From 8ec25c24db9f1ad9be437ef266688272686daf42 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 24 Oct 2025 15:46:35 +0300 Subject: [PATCH] global: Remove default service/*/service_extra_groups=$SET:default_internal_group This is no longer necessary now that mail_access_groups sets it. --- src/doveadm/doveadm-settings.c | 4 +++- src/imap-urlauth/imap-urlauth-worker-settings.c | 4 +++- src/imap/imap-settings.c | 4 +++- src/indexer/indexer-worker-settings.c | 4 +++- src/lib-settings/settings-history-core.txt | 7 +++++++ src/lmtp/lmtp-settings.c | 4 +++- src/pop3/pop3-settings.c | 4 +++- src/submission/submission-settings.c | 4 +++- 8 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c index 974bd4bf2f..690f999b81 100644 --- a/src/doveadm/doveadm-settings.c +++ b/src/doveadm/doveadm-settings.c @@ -47,7 +47,9 @@ const struct setting_keyvalue doveadm_service_settings_defaults[] = { { "unix_listener/doveadm-server/type", "tcp" }, { "unix_listener/doveadm-server/mode", "0600" }, - { "service_extra_groups", "$SET:default_internal_group" }, + /* This needs to be here explicitly until the backwards compatibility + is removed from settings-history-core.txt */ + { "service_extra_groups", "" }, { NULL, NULL } }; diff --git a/src/imap-urlauth/imap-urlauth-worker-settings.c b/src/imap-urlauth/imap-urlauth-worker-settings.c index c5e3129dc0..0a8e6bd317 100644 --- a/src/imap-urlauth/imap-urlauth-worker-settings.c +++ b/src/imap-urlauth/imap-urlauth-worker-settings.c @@ -39,7 +39,9 @@ const struct setting_keyvalue imap_urlauth_worker_service_settings_defaults[] = { "unix_listener/"IMAP_URLAUTH_WORKER_SOCKET"/mode", "0600" }, { "unix_listener/"IMAP_URLAUTH_WORKER_SOCKET"/user", "$SET:default_internal_user" }, - { "service_extra_groups", "$SET:default_internal_group" }, + /* This needs to be here explicitly until the backwards compatibility + is removed from settings-history-core.txt */ + { "service_extra_groups", "" }, { NULL, NULL } }; diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c index 6a07a1ab1a..9826727ae2 100644 --- a/src/imap/imap-settings.c +++ b/src/imap/imap-settings.c @@ -59,7 +59,9 @@ const struct setting_keyvalue imap_service_settings_defaults[] = { { "unix_listener/srv.imap\\s%{pid}/type", "admin" }, { "unix_listener/srv.imap\\s%{pid}/mode", "0600" }, - { "service_extra_groups", "$SET:default_internal_group" }, + /* This needs to be here explicitly until the backwards compatibility + is removed from settings-history-core.txt */ + { "service_extra_groups", "" }, { NULL, NULL } }; diff --git a/src/indexer/indexer-worker-settings.c b/src/indexer/indexer-worker-settings.c index c78b083ca7..0e99a40756 100644 --- a/src/indexer/indexer-worker-settings.c +++ b/src/indexer/indexer-worker-settings.c @@ -36,7 +36,9 @@ const struct setting_keyvalue indexer_worker_service_settings_defaults[] = { { "unix_listener/srv.indexer-worker\\s%{pid}/type", "admin" }, { "unix_listener/srv.indexer-worker\\s%{pid}/mode", "0600" }, - { "service_extra_groups", "$SET:default_internal_group" }, + /* This needs to be here explicitly until the backwards compatibility + is removed from settings-history-core.txt */ + { "service_extra_groups", "" }, { NULL, NULL } }; diff --git a/src/lib-settings/settings-history-core.txt b/src/lib-settings/settings-history-core.txt index eb30e8c3d8..b5113742e9 100644 --- a/src/lib-settings/settings-history-core.txt +++ b/src/lib-settings/settings-history-core.txt @@ -1,3 +1,10 @@ +default service/doveadm/service_extra_groups $SET:default_internal_group 2.4.3 3.2.0 +default service/imap/service_extra_groups $SET:default_internal_group 2.4.3 3.2.0 +default service/imap-urlauth-worker/service_extra_groups $SET:default_internal_group 2.4.3 3.2.0 +default service/indexer-worker/service_extra_groups $SET:default_internal_group 2.4.3 3.2.0 +default service/lmtp/service_extra_groups $SET:default_internal_group 2.4.3 3.2.0 +default service/pop3/service_extra_groups $SET:default_internal_group 2.4.3 3.2.0 +default service/submission/service_extra_groups $SET:default_internal_group 2.4.3 3.2.0 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 diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c index 1d449c0ee5..12250a6d1f 100644 --- a/src/lmtp/lmtp-settings.c +++ b/src/lmtp/lmtp-settings.c @@ -51,7 +51,9 @@ const struct setting_keyvalue lmtp_service_settings_defaults[] = { { "inet_listener/lmtp/port", "24" }, #endif - { "service_extra_groups", "$SET:default_internal_group" }, + /* This needs to be here explicitly until the backwards compatibility + is removed from settings-history-core.txt */ + { "service_extra_groups", "" }, { NULL, NULL } }; diff --git a/src/pop3/pop3-settings.c b/src/pop3/pop3-settings.c index 3dc5f09fda..b484f68070 100644 --- a/src/pop3/pop3-settings.c +++ b/src/pop3/pop3-settings.c @@ -49,7 +49,9 @@ const struct setting_keyvalue pop3_service_settings_defaults[] = { { "unix_listener/srv.pop3\\s%{pid}/type", "admin" }, { "unix_listener/srv.pop3\\s%{pid}/mode", "0600" }, - { "service_extra_groups", "$SET:default_internal_group" }, + /* This needs to be here explicitly until the backwards compatibility + is removed from settings-history-core.txt */ + { "service_extra_groups", "" }, { NULL, NULL } }; diff --git a/src/submission/submission-settings.c b/src/submission/submission-settings.c index 6f3d979a59..8a6485f426 100644 --- a/src/submission/submission-settings.c +++ b/src/submission/submission-settings.c @@ -49,7 +49,9 @@ const struct setting_keyvalue submission_service_settings_defaults[] = { { "unix_listener/srv.submission\\s%{pid}/type", "admin" }, { "unix_listener/srv.submission\\s%{pid}/mode", "0600" }, - { "service_extra_groups", "$SET:default_internal_group" }, + /* This needs to be here explicitly until the backwards compatibility + is removed from settings-history-core.txt */ + { "service_extra_groups", "" }, { NULL, NULL } }; -- 2.47.3