dovecot: hidden=yes list=yes is a valid namespace combination
dovecot at dovecot.org
dovecot at dovecot.org
Tue Oct 9 17:30:12 EEST 2007
details: http://hg.dovecot.org/dovecot/rev/2d0b59aeb41a
changeset: 6543:2d0b59aeb41a
user: Timo Sirainen <tss at iki.fi>
date: Tue Oct 09 17:30:07 2007 +0300
description:
hidden=yes list=yes is a valid namespace combination
diffstat:
2 files changed, 2 insertions(+), 3 deletions(-)
src/lib-storage/mail-namespace.c | 3 +--
src/master/mail-process.c | 2 +-
diffs (25 lines):
diff -r 402d14b5ef8b -r 2d0b59aeb41a src/lib-storage/mail-namespace.c
--- a/src/lib-storage/mail-namespace.c Tue Oct 09 17:23:11 2007 +0300
+++ b/src/lib-storage/mail-namespace.c Tue Oct 09 17:30:07 2007 +0300
@@ -43,8 +43,7 @@ namespace_add_env(pool_t pool, const cha
ns->flags |= NAMESPACE_FLAG_INBOX;
if (getenv(t_strdup_printf("NAMESPACE_%u_HIDDEN", num)) != NULL)
ns->flags |= NAMESPACE_FLAG_HIDDEN;
- if ((ns->flags & NAMESPACE_FLAG_HIDDEN) == 0 &&
- getenv(t_strdup_printf("NAMESPACE_%u_LIST", num)) != NULL)
+ if (getenv(t_strdup_printf("NAMESPACE_%u_LIST", num)) != NULL)
ns->flags |= NAMESPACE_FLAG_LIST;
if (type == NULL || *type == '\0' || strncmp(type, "private", 7) == 0)
diff -r 402d14b5ef8b -r 2d0b59aeb41a src/master/mail-process.c
--- a/src/master/mail-process.c Tue Oct 09 17:23:11 2007 +0300
+++ b/src/master/mail-process.c Tue Oct 09 17:30:07 2007 +0300
@@ -273,7 +273,7 @@ env_put_namespace(struct namespace_setti
env_put(t_strdup_printf("NAMESPACE_%u_INBOX=1", i));
if (ns->hidden)
env_put(t_strdup_printf("NAMESPACE_%u_HIDDEN=1", i));
- else if (ns->list)
+ if (ns->list)
env_put(t_strdup_printf("NAMESPACE_%u_LIST=1", i));
t_pop();
}
More information about the dovecot-cvs
mailing list