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 fad0619d617e59da544b1042ddf3708ade84e36d..bc6b1b5982fc37e50bb4fae4a1774af57138259b 100644 (file)
--- 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 3244328bfda679e161637d0a5163024d4273dd76..5500bae5033992bc6fb86fbe2fc11e4f07713c79 100644 (file)
--- 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 4d3ec3b474921f9174a7a03be04dcf99e4609a75..d4a41628c9e9cc45ed69e81e2059c0a74cae092d 100644 (file)
--- 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;