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 73d7ba16edb83a5df65a0ac46bbc6867e7391c3b..3775212c2c51b300ea8f394953d03417867ec0ea 100644 (file)
--- 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);