Mercurial > dovecot > original-hg > dovecot-1.2

changeset 9555:0cf38dcd8ced HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't double-expand mail_location %variables when namespace location is empty.
author Timo Sirainen <tss@iki.fi>
date Sat, 27 Mar 2010 03:54:00 +0200
parents 59591ed04610
children a39372cd040c
files src/master/mail-process.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/master/mail-process.c	Mon Mar 22 02:16:48 2010 +0200
+++ b/src/master/mail-process.c	Sat Mar 27 03:54:00 2010 +0200
@@ -277,9 +277,10 @@
 		default_location = "";
 
 	for (i = 1; ns != NULL; i++, ns = ns->next) {
-		location = *ns->location != '\0' ? ns->location :
-			default_location;
-		location = expand_mail_env(location, table);
+		if (*ns->location == '\0')
+			location = default_location;
+		else
+			location = expand_mail_env(ns->location, table);
 		env_put(t_strdup_printf("NAMESPACE_%u=%s", i, location));
 
 		if (ns->separator != NULL) {