dovecot: Last commit broke mail_drop_priv_before_exec/mail_chroo...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot/rev/a00dc6f78106
changeset: 7257:a00dc6f78106
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Feb 16 16:29:18 2008 +0200
description:
Last commit broke mail_drop_priv_before_exec/mail_chroot conflict check.

diffstat:

1 file changed, 6 insertions(+), 6 deletions(-)
src/master/mail-process.c |   12 ++++++------

diffs (26 lines):

diff -r f3508f678485 -r a00dc6f78106 src/master/mail-process.c
--- a/src/master/mail-process.c	Sat Feb 16 16:27:08 2008 +0200
+++ b/src/master/mail-process.c	Sat Feb 16 16:29:18 2008 +0200
@@ -621,16 +621,16 @@ create_mail_process(enum process_type pr
 				chroot_dir, user);
 			return MASTER_LOGIN_STATUS_INTERNAL_ERROR;
 		}
-		if (set->mail_drop_priv_before_exec) {
-			i_error("Can't chroot to directory '%s' (user %s) "
-				"with mail_drop_priv_before_exec=yes",
-				chroot_dir, user);
-			return MASTER_LOGIN_STATUS_INTERNAL_ERROR;
-		}
 	} else if (*set->mail_chroot != '\0') {
 		/* mail_chroot setting's value doesn't need to be in
 		   valid_chroot_dirs. */
 		chroot_dir = set->mail_chroot;
+	}
+	if (*chroot_dir != '\0' && set->mail_drop_priv_before_exec) {
+		i_error("Can't chroot to directory '%s' (user %s) "
+			"with mail_drop_priv_before_exec=yes",
+			chroot_dir, user);
+		return MASTER_LOGIN_STATUS_INTERNAL_ERROR;
 	}
 
 	if (!dump_capability) {