# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1291596762 0
# Node ID 565351636cd760d5dacfbc9ebe570892933997b7
# Parent  ecf551a5fe8693940f78f675b975bd3a04ec4d77
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 -r ecf551a5fe86 -r 565351636cd7 src/imap/cmd-subscribe.c
--- a/src/imap/cmd-subscribe.c	Mon Dec 06 00:42:42 2010 +0000
+++ b/src/imap/cmd-subscribe.c	Mon Dec 06 00:52:42 2010 +0000
@@ -70,6 +70,10 @@
 	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 -r ecf551a5fe86 -r 565351636cd7 src/lib-storage/mailbox-list.c
--- a/src/lib-storage/mailbox-list.c	Mon Dec 06 00:42:42 2010 +0000
+++ b/src/lib-storage/mailbox-list.c	Mon Dec 06 00:52:42 2010 +0000
@@ -1149,12 +1149,6 @@
 	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;