dovecot-2.1: lib-storage: Added "disabled" setting for namespaces.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/0ee2f712b489
changeset: 14695:0ee2f712b489
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Sep 04 17:18:08 2012 +0300
description:
lib-storage: Added "disabled" setting for namespaces.

diffstat:

 src/lib-storage/mail-namespace.c        |  3 +++
 src/lib-storage/mail-storage-settings.c |  2 ++
 src/lib-storage/mail-storage-settings.h |  1 +
 3 files changed, 6 insertions(+), 0 deletions(-)

diffs (43 lines):

diff -r d079d72abb79 -r 0ee2f712b489 src/lib-storage/mail-namespace.c
--- a/src/lib-storage/mail-namespace.c	Sun Sep 02 16:06:45 2012 +0300
+++ b/src/lib-storage/mail-namespace.c	Tue Sep 04 17:18:08 2012 +0300
@@ -293,6 +293,9 @@
 		count = 0;
 	}
 	for (i = 0; i < count; i++) {
+		if (ns_set[i]->disabled)
+			continue;
+
 		if (namespace_add(user, ns_set[i], unexpanded_ns_set[i],
 				  mail_set, ns_p, error_r) < 0) {
 			if (!ns_set[i]->ignore_on_failure)
diff -r d079d72abb79 -r 0ee2f712b489 src/lib-storage/mail-storage-settings.c
--- a/src/lib-storage/mail-storage-settings.c	Sun Sep 02 16:06:45 2012 +0300
+++ b/src/lib-storage/mail-storage-settings.c	Tue Sep 04 17:18:08 2012 +0300
@@ -154,6 +154,7 @@
 	DEF(SET_ENUM, list),
 	DEF(SET_BOOL, subscriptions),
 	DEF(SET_BOOL, ignore_on_failure),
+	DEF(SET_BOOL, disabled),
 
 	DEFLIST_UNIQUE(mailboxes, "mailbox", &mailbox_setting_parser_info),
 
@@ -173,6 +174,7 @@
 	.list = "yes:no:children",
 	.subscriptions = TRUE,
 	.ignore_on_failure = FALSE,
+	.disabled = FALSE,
 
 	.mailboxes = ARRAY_INIT
 };
diff -r d079d72abb79 -r 0ee2f712b489 src/lib-storage/mail-storage-settings.h
--- a/src/lib-storage/mail-storage-settings.h	Sun Sep 02 16:06:45 2012 +0300
+++ b/src/lib-storage/mail-storage-settings.h	Tue Sep 04 17:18:08 2012 +0300
@@ -54,6 +54,7 @@
 	const char *list;
 	bool subscriptions;
 	bool ignore_on_failure;
+	bool disabled;
 
 	ARRAY_DEFINE(mailboxes, struct mailbox_settings *);
 	struct mail_user_settings *user_set;