Mercurial > dovecot > original-hg > dovecot-1.2
changeset 7258:de96d58b6ee2 HEAD
Last commit broke mail_drop_priv_before_exec/mail_chroot conflict check.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sat, 16 Feb 2008 16:29:19 +0200 |
| parents | 1f982f1201ef |
| children | 2aa39f1e3993 |
| files | src/master/mail-process.c |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/master/mail-process.c Sat Feb 16 16:27:11 2008 +0200 +++ b/src/master/mail-process.c Sat Feb 16 16:29:19 2008 +0200 @@ -621,17 +621,17 @@ 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) { log_fd = log_create_pipe(&log, set->mail_log_max_lines_per_sec);