dovecot-1.2: Don't double-expand mail_location %variables when n...
dovecot at dovecot.org
dovecot at dovecot.org
Sat Mar 27 03:54:04 EET 2010
details: http://hg.dovecot.org/dovecot-1.2/rev/0cf38dcd8ced
changeset: 9555:0cf38dcd8ced
user: Timo Sirainen <tss at iki.fi>
date: Sat Mar 27 03:54:00 2010 +0200
description:
Don't double-expand mail_location %variables when namespace location is empty.
diffstat:
src/master/mail-process.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diffs (17 lines):
diff -r 59591ed04610 -r 0cf38dcd8ced src/master/mail-process.c
--- 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) {
More information about the dovecot-cvs
mailing list