[dovecot-cvs] dovecot/src/imap cmd-subscribe.c,1.14,1.15

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv28698

Modified Files:
	cmd-subscribe.c 
Log Message:
If tb-extra-mailbox-sep workaround was enabled, subscribing was broken
unless the namespace had empty prefix.



Index: cmd-subscribe.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/cmd-subscribe.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cmd-subscribe.c	13 Jan 2006 20:25:59 -0000	1.14
+++ cmd-subscribe.c	16 Jun 2006 09:43:54 -0000	1.15
@@ -23,15 +23,15 @@
 		if (mailbox[strlen(mailbox)-1] ==
 		    mail_storage_get_hierarchy_sep(storage))
 			verify_name = t_strndup(mailbox, strlen(mailbox)-1);
+	} else {
+		storage = client_find_storage(cmd, &mailbox);
+		if (storage == NULL)
+			return TRUE;
 	}
 
 	if (!client_verify_mailbox_name(cmd, verify_name, subscribe, FALSE))
 		return TRUE;
 
-	storage = client_find_storage(cmd, &mailbox);
-	if (storage == NULL)
-		return TRUE;
-
 	if (mail_storage_set_subscribed(storage, mailbox, subscribe) < 0)
 		client_send_storage_error(cmd, storage);
 	else {