[dovecot-cvs] dovecot/src/master mail-process.c,1.31,1.32 master-settings.c,1.29,1.30 master-settings.h,1.18,1.19

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/master
In directory danu:/tmp/cvs-serv27654/src/master

Modified Files:
	mail-process.c master-settings.c master-settings.h 
Log Message:
Added mail_chroot setting to specify default chroot.



Index: mail-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/mail-process.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- mail-process.c	20 Aug 2003 22:12:44 -0000	1.31
+++ mail-process.c	24 Aug 2003 13:14:47 -0000	1.32
@@ -156,6 +156,9 @@
 	home_dir = data + reply->home_idx;
 	chroot_dir = data + reply->chroot_idx;
 
+	if (*chroot_dir == '\0')
+		chroot_dir = set->mail_chroot;
+
 	if (*chroot_dir != '\0' && !validate_chroot(set, chroot_dir)) {
 		i_error("Invalid chroot directory: %s", chroot_dir);
 		return FALSE;

Index: master-settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- master-settings.c	24 Aug 2003 12:49:43 -0000	1.29
+++ master-settings.c	24 Aug 2003 13:14:47 -0000	1.30
@@ -68,6 +68,7 @@
 
 	/* mail */
 	DEF(SET_STR, valid_chroot_dirs),
+	DEF(SET_STR, mail_chroot),
 	DEF(SET_INT, max_mail_processes),
 	DEF(SET_BOOL, verbose_proctitle),
 

Index: master-settings.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- master-settings.h	24 Aug 2003 07:37:41 -0000	1.18
+++ master-settings.h	24 Aug 2003 13:14:47 -0000	1.19
@@ -45,6 +45,7 @@
 
 	/* mail */
 	const char *valid_chroot_dirs;
+	const char *mail_chroot;
 	unsigned int max_mail_processes;
 	int verbose_proctitle;