dovecot-2.0: lib-storage: Preserve permission settings in master...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/d6f387fe1275
changeset: 12017:d6f387fe1275
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Aug 20 18:19:04 2010 +0100
description:
lib-storage: Preserve permission settings in master's service blocks.
Most importantly preserve extra_groups setting.

diffstat:

 src/lib-storage/mail-storage-service.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 77a043a1ddb5 -r d6f387fe1275 src/lib-storage/mail-storage-service.c
--- a/src/lib-storage/mail-storage-service.c	Fri Aug 20 18:18:01 2010 +0100
+++ b/src/lib-storage/mail-storage-service.c	Fri Aug 20 18:19:04 2010 +0100
@@ -301,6 +301,7 @@
 
 	current_euid = geteuid();
 	restrict_access_init(&rset);
+	restrict_access_get_env(&rset);
 	if (*set->mail_uid != '\0') {
 		if (!parse_uid(set->mail_uid, &rset.uid)) {
 			*error_r = t_strdup_printf("Unknown mail_uid user: %s",
@@ -341,8 +342,10 @@
 			return -1;
 		}
 	}
-	if (*set->mail_access_groups != '\0')
-		rset.extra_groups = set->mail_access_groups;
+	if (*set->mail_access_groups != '\0') {
+		rset.extra_groups = t_strconcat(set->mail_access_groups, ",",
+						rset.extra_groups, NULL);
+	}
 
 	rset.first_valid_gid = set->first_valid_gid;
 	rset.last_valid_gid = set->last_valid_gid;