From: sergey.kitov <sergey.kitov@open-xchange.com>
Date: Fri, 15 Sep 2023 13:19:35 +0000 (+0300)
Subject: lib-storage: change mail_access_groups to BOOLLIST.
X-Git-Tag: 2.4.0~586
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6334d7c00088aae626ade18883618d2660b2d5b;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: change mail_access_groups to BOOLLIST.
---

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index fad0619d61..bc6b1b5982 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -531,8 +531,8 @@ service_drop_privileges(struct mail_storage_service_user *user,
 			return -1;
 		}
 	}
-	if (*set->mail_access_groups != '\0') {
-		rset.extra_groups = t_strconcat(set->mail_access_groups, ",",
+	if (array_not_empty(&set->mail_access_groups)) {
+		rset.extra_groups = t_strconcat(t_array_const_string_join(&set->mail_access_groups, ","), ",",
 						rset.extra_groups, NULL);
 	}
 
diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index 3244328bfd..5500bae503 100644
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -320,7 +320,7 @@ static const struct setting_define mail_user_setting_defines[] = {
 	DEF(STR, mail_gid),
 	DEF(STR, mail_home),
 	DEF(STR, mail_chroot),
-	DEF(STR, mail_access_groups),
+	DEF(BOOLLIST, mail_access_groups),
 	DEF(STR, mail_privileged_group),
 	DEF(STR, valid_chroot_dirs),
 
@@ -350,7 +350,7 @@ static const struct mail_user_settings mail_user_default_settings = {
 	.mail_gid = "",
 	.mail_home = "",
 	.mail_chroot = "",
-	.mail_access_groups = "",
+	.mail_access_groups = ARRAY_INIT,
 	.mail_privileged_group = "",
 	.valid_chroot_dirs = "",
 
diff --git a/src/lib-storage/mail-storage-settings.h b/src/lib-storage/mail-storage-settings.h
index 4d3ec3b474..d4a41628c9 100644
--- a/src/lib-storage/mail-storage-settings.h
+++ b/src/lib-storage/mail-storage-settings.h
@@ -159,7 +159,7 @@ struct mail_user_settings {
 	const char *mail_gid;
 	const char *mail_home;
 	const char *mail_chroot;
-	const char *mail_access_groups;
+	ARRAY_TYPE(const_string) mail_access_groups;
 	const char *mail_privileged_group;
 	const char *valid_chroot_dirs;