From: Timo Sirainen <tss@iki.fi>
Date: Mon, 6 Dec 2010 00:52:42 +0000 (+0000)
Subject: lib-storage: Removed subscription name validity check from lib-storage after all.
X-Git-Tag: 2.1.alpha1~450
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d450553148026d83f1c672d15b27c451edd726dc;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Removed subscription name validity check from lib-storage after all.
It could have broken when subscriptions were being set for subscriptions=no
namespace.
---

diff --git a/src/imap/cmd-subscribe.c b/src/imap/cmd-subscribe.c
index 345c3e7eaa..69b3198516 100644
--- a/src/imap/cmd-subscribe.c
+++ b/src/imap/cmd-subscribe.c
@@ -70,6 +70,10 @@ bool cmd_subscribe_full(struct client_command_context *cmd, bool subscribe)
 	box_ns = client_find_namespace(cmd, mailbox, &storage_name);
 	if (box_ns == NULL)
 		return TRUE;
+	if (!mailbox_list_is_valid_existing_name(box_ns->list, storage_name)) {
+		client_send_tagline(cmd, "NO [CANNOT] Invalid mailbox name");
+		return TRUE;
+	}
 
 	/* now find a namespace where the subscription can be added to */
 	subs_name = mailbox;
diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 26ddda61de..17fd7721ae 100644
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -1149,12 +1149,6 @@ int mailbox_list_set_subscribed(struct mailbox_list *list,
 	uint8_t guid[MAIL_GUID_128_SIZE];
 	int ret;
 
-	if (!mailbox_list_is_valid_existing_name(list, name)) {
-		mailbox_list_set_error(list, MAIL_ERROR_PARAMS,
-				       "Invalid mailbox name");
-		return -1;
-	}
-
 	if ((ret = list->v.set_subscribed(list, name, set)) <= 0)
 		return ret;