# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1215866941 -10800
# Node ID 907835a6595cd78b9d9bb4e1e03194c9d4c6b95c
# Parent  04720c150b7212e08167ae65fabd76d910805273
deliver didn't expand %variables in namespace location settings.

diff -r 04720c150b72 -r 907835a6595c src/deliver/deliver.c
--- a/src/deliver/deliver.c	Sat Jul 12 02:13:55 2008 +0300
+++ b/src/deliver/deliver.c	Sat Jul 12 15:49:01 2008 +0300
@@ -694,7 +694,7 @@
 static void expand_envs(const char *user)
 {
         const struct var_expand_table *table;
-	const char *mail_env, *const *envs, *home;
+	const char *mail_env, *const *envs, *home, *env_name;
 	unsigned int i, count;
 	string_t *str;
 
@@ -713,16 +713,26 @@
 	for (i = 0; i < count; i++)
 		env_put(envs[i]);
 
+	/* get the table again in case plugin envs provided the home
+	   directory (yea, kludgy) */
+	if (home == NULL)
+		home = getenv("HOME");
+	table = get_var_expand_table(user, home);
+
 	mail_env = getenv("MAIL_LOCATION");
-	if (mail_env != NULL) {
-		/* get the table again in case plugin envs provided the home
-		   directory (yea, kludgy) */
-		if (home == NULL)
-			home = getenv("HOME");
-		table = get_var_expand_table(user, home);
+	if (mail_env != NULL)
 		mail_env = expand_mail_env(mail_env, table);
+	env_put(t_strconcat("MAIL=", mail_env, NULL));
+
+	for (i = 1;; i++) {
+		env_name = t_strdup_printf("NAMESPACE_%u", i);
+		mail_env = getenv(env_name);
+		if (mail_env == NULL)
+			break;
+
+		mail_env = expand_mail_env(mail_env, table);
+		env_put(t_strconcat(env_name, "=", mail_env, NULL));
 	}
-	env_put(t_strconcat("MAIL=", mail_env, NULL));
 }
 
 static void putenv_extra_fields(ARRAY_TYPE(string) *extra_fields)