From: Timo Sirainen <tss@iki.fi>
Date: Sun, 5 Oct 2008 14:12:11 +0000 (+0300)
Subject: Don't expand ~/ in mail_location or namespace location.
X-Git-Tag: 1.2.alpha2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67f91234e6f485d9e913f3106f86e3039440b7e1;p=thirdparty%2Fdovecot%2Fcore.git

Don't expand ~/ in mail_location or namespace location.
lib-storage does that expansion in any case and this is kind of a kludgy
workaround to allow expire-tool to work by letting it expand the ~.

--HG--
branch : HEAD
---

diff --git a/src/master/mail-process.c b/src/master/mail-process.c
index 73d7ba16ed..3775212c2c 100644
--- a/src/master/mail-process.c
+++ b/src/master/mail-process.c
@@ -224,12 +224,6 @@ expand_mail_env(const char *env, const struct var_expand_table *table)
 		str_append_c(str, *env++);
 	}
 
-	if (env[0] == '~' &&
-	    (env[1] == '/' || env[1] == '\0' || env[1] == ':')) {
-		/* expand home */
-		env = t_strconcat("%h", env+1, NULL);
-	}
-
 	/* expand %vars */
 	var_expand(str, env, table);
 	return str_c(str);