[dovecot-cvs] dovecot/src/master auth-process.c, 1.55, 1.56 login-process.c, 1.55, 1.56 mail-process.c, 1.50, 1.51 master-settings.c, 1.54, 1.55 master-settings.h, 1.34, 1.35

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv2666/src/master

Modified Files:
	auth-process.c login-process.c mail-process.c 
	master-settings.c master-settings.h 
Log Message:
Added mail_extra_groups setting.



Index: auth-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/auth-process.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- auth-process.c	29 May 2004 16:43:22 -0000	1.55
+++ auth-process.c	16 Jun 2004 02:04:02 -0000	1.56
@@ -324,7 +324,8 @@
 
 	/* setup access environment */
 	restrict_access_set_env(group->set->user, group->set->uid,
-				group->set->gid, group->set->chroot, 0, 0);
+				group->set->gid, group->set->chroot,
+				0, 0, NULL);
 
 	/* set other environment */
 	env_put(t_strconcat("AUTH_PROCESS=", dec2str(getpid()), NULL));

Index: login-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/login-process.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- login-process.c	31 May 2004 18:04:47 -0000	1.55
+++ login-process.c	16 Jun 2004 02:04:02 -0000	1.56
@@ -383,7 +383,7 @@
 	restrict_access_set_env(set->login_user, set->login_uid,
 				set->server->login_gid,
 				set->login_chroot ? set->login_dir : NULL,
-				0, 0);
+				0, 0, NULL);
 
 	env_put("DOVECOT_MASTER=1");
 

Index: mail-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/mail-process.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- mail-process.c	11 Jun 2004 03:21:46 -0000	1.50
+++ mail-process.c	16 Jun 2004 02:04:02 -0000	1.51
@@ -268,7 +268,8 @@
 	   (paranoia about filling up environment without noticing) */
 	restrict_access_set_env(data + reply->system_user_idx,
 				reply->uid, reply->gid, chroot_dir,
-				set->first_valid_gid, set->last_valid_gid);
+				set->first_valid_gid, set->last_valid_gid,
+				set->mail_extra_groups);
 
 	restrict_process_size(group->set->mail_process_size, (unsigned int)-1);
 

Index: master-settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- master-settings.c	15 Jun 2004 18:17:56 -0000	1.54
+++ master-settings.c	16 Jun 2004 02:04:02 -0000	1.55
@@ -79,6 +79,7 @@
 	DEF(SET_INT, last_valid_uid),
 	DEF(SET_INT, first_valid_gid),
 	DEF(SET_INT, last_valid_gid),
+	DEF(SET_STR, mail_extra_groups),
 
 	DEF(SET_STR, default_mail_env),
 	DEF(SET_STR, mail_cache_fields),
@@ -210,6 +211,7 @@
 	MEMBER(last_valid_uid) 0,
 	MEMBER(first_valid_gid) 1,
 	MEMBER(last_valid_gid) 0,
+	MEMBER(mail_extra_groups) NULL,
 
 	MEMBER(default_mail_env) NULL,
 	MEMBER(mail_cache_fields) "MessagePart",

Index: master-settings.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- master-settings.h	11 Jun 2004 03:21:46 -0000	1.34
+++ master-settings.h	16 Jun 2004 02:04:02 -0000	1.35
@@ -54,6 +54,7 @@
 
 	unsigned int first_valid_uid, last_valid_uid;
 	unsigned int first_valid_gid, last_valid_gid;
+	const char *mail_extra_groups;
 
 	const char *default_mail_env;
 	const char *mail_cache_fields;