changeset 8707:af3fa3dd0d31 HEAD

If mail_chroot is set, don't fail at startup in dump-capability.
author Timo Sirainen <tss@iki.fi>
date Tue, 03 Feb 2009 11:57:35 -0500
parents e2251b0bd12b
children 7c4f4a1b1313
files src/master/mail-process.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/master/mail-process.c	Mon Feb 02 19:03:25 2009 -0500
+++ b/src/master/mail-process.c	Tue Feb 03 11:57:35 2009 -0500
@@ -768,7 +768,7 @@
 	/* setup environment - set the most important environment first
 	   (paranoia about filling up environment without noticing) */
 	restrict_access_set_env(system_user, uid, gid, set->mail_priv_gid_t,
-				chroot_dir,
+				dump_capability ? "" : chroot_dir,
 				set->first_valid_gid, set->last_valid_gid,
 				set->mail_access_groups);
 
@@ -777,7 +777,7 @@
 	if (dump_capability)
 		env_put("DUMP_CAPABILITY=1");
 
-	if (*home_dir == '\0' && *chroot_dir == '\0') {
+	if ((*home_dir == '\0' && *chroot_dir == '\0') || dump_capability) {
 		full_home_dir = "";
 		ret = -1;
 	} else {