From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 7 Feb 2018 14:31:12 +0000 (+0200)
Subject: global: Set extra_groups=$default_internal_group for various services
X-Git-Tag: 2.3.1~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d2dd93d0e057280ea3569d3e37ed91ae63f57f6;p=thirdparty%2Fdovecot%2Fcore.git

global: Set extra_groups=$default_internal_group for various services

Services with user=$default_internal_user are expected to already set the
group properly. This change is adding the group for mail processes.
---

diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c
index fa7b1009ef..b3601598c7 100644
--- a/src/doveadm/doveadm-settings.c
+++ b/src/doveadm/doveadm-settings.c
@@ -29,7 +29,7 @@ struct service_settings doveadm_service_settings = {
 	.user = "",
 	.group = "",
 	.privileged_group = "",
-	.extra_groups = "",
+	.extra_groups = "$default_internal_group",
 	.chroot = "",
 
 	.drop_priv_before_exec = FALSE,
diff --git a/src/imap-urlauth/imap-urlauth-worker-settings.c b/src/imap-urlauth/imap-urlauth-worker-settings.c
index 46e2f674bb..4b91ea1360 100644
--- a/src/imap-urlauth/imap-urlauth-worker-settings.c
+++ b/src/imap-urlauth/imap-urlauth-worker-settings.c
@@ -30,7 +30,7 @@ struct service_settings imap_urlauth_worker_service_settings = {
 	.user = "",
 	.group = "",
 	.privileged_group = "",
-	.extra_groups = "",
+	.extra_groups = "$default_internal_group",
 	.chroot = "",
 
 	.drop_priv_before_exec = FALSE,
diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c
index 2d3b780258..69a3950e30 100644
--- a/src/imap/imap-settings.c
+++ b/src/imap/imap-settings.c
@@ -37,7 +37,7 @@ struct service_settings imap_service_settings = {
 	.user = "",
 	.group = "",
 	.privileged_group = "",
-	.extra_groups = "",
+	.extra_groups = "$default_internal_group",
 	.chroot = "",
 
 	.drop_priv_before_exec = FALSE,
diff --git a/src/indexer/indexer-worker-settings.c b/src/indexer/indexer-worker-settings.c
index 3721a05944..38cfeed8c8 100644
--- a/src/indexer/indexer-worker-settings.c
+++ b/src/indexer/indexer-worker-settings.c
@@ -27,7 +27,7 @@ struct service_settings indexer_worker_service_settings = {
 	.user = "",
 	.group = "",
 	.privileged_group = "",
-	.extra_groups = "",
+	.extra_groups = "$default_internal_group",
 	.chroot = "",
 
 	.drop_priv_before_exec = FALSE,
diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c
index bca0744621..eff29ae65f 100644
--- a/src/lmtp/lmtp-settings.c
+++ b/src/lmtp/lmtp-settings.c
@@ -36,7 +36,7 @@ struct service_settings lmtp_service_settings = {
 	.user = "",
 	.group = "",
 	.privileged_group = "",
-	.extra_groups = "",
+	.extra_groups = "$default_internal_group",
 	.chroot = "",
 
 	.drop_priv_before_exec = FALSE,
diff --git a/src/pop3/pop3-settings.c b/src/pop3/pop3-settings.c
index 70e8b50ee4..2d4a3cfff2 100644
--- a/src/pop3/pop3-settings.c
+++ b/src/pop3/pop3-settings.c
@@ -33,7 +33,7 @@ struct service_settings pop3_service_settings = {
 	.user = "",
 	.group = "",
 	.privileged_group = "",
-	.extra_groups = "",
+	.extra_groups = "$default_internal_group",
 	.chroot = "",
 
 	.drop_priv_before_exec = FALSE,
diff --git a/src/submission/submission-settings.c b/src/submission/submission-settings.c
index b7668c5078..160ec08777 100644
--- a/src/submission/submission-settings.c
+++ b/src/submission/submission-settings.c
@@ -33,7 +33,7 @@ struct service_settings submission_service_settings = {
 	.user = "",
 	.group = "",
 	.privileged_group = "",
-	.extra_groups = "",
+	.extra_groups = "$default_internal_group",
 	.chroot = "",
 
 	.drop_priv_before_exec = FALSE,