From: Timo Sirainen <tss@iki.fi>
Date: Mon, 15 Sep 2003 13:59:08 +0000 (+0300)
Subject: Support %vars in namespace prefix.
X-Git-Tag: 1.1.alpha1~4334
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b395e84b2a530112a3f9ad72e7b0db915e48276;p=thirdparty%2Fdovecot%2Fcore.git

Support %vars in namespace prefix.

--HG--
branch : HEAD
---

diff --git a/src/master/mail-process.c b/src/master/mail-process.c
index 4738218749..e8785fbdc3 100644
--- a/src/master/mail-process.c
+++ b/src/master/mail-process.c
@@ -109,6 +109,7 @@ static void env_put_namespace(struct namespace_settings *ns,
 {
 	const char *location;
 	unsigned int i;
+	string_t *str;
 
 	if (default_location == NULL)
 		default_location = "";
@@ -130,8 +131,11 @@ static void env_put_namespace(struct namespace_settings *ns,
 						i, ns->type));
 		}
 		if (ns->prefix != NULL) {
-			env_put(t_strdup_printf("NAMESPACE_%u_PREFIX=%s",
-						i, ns->prefix));
+			/* expand variables, eg. ~%u/ can be useful */
+			str = t_str_new(256);
+			str_printfa(str, "NAMESPACE_%u_PREFIX=", i);
+			var_expand(str, ns->prefix, user, home);
+			env_put(str_c(str));
 		}
 		if (ns->inbox)
 			env_put(t_strdup_printf("NAMESPACE_%u_INBOX=1", i));