[SVN] r452 - in /branches/cvsmerge/cyrus-cvs/imap: imapd.c
mboxlist.c
debian at incase.de
debian at incase.de
Fri May 12 09:50:37 UTC 2006
Author: sven
Date: Fri May 12 11:50:36 2006
New Revision: 452
URL: https://mail.incase.de/viewcvs?rev=452&root=cyrus22&view=rev
Log:
remove redundant check for wildcards in mailbox names (Wes Craig <wes at umich.edu>)
Modified:
branches/cvsmerge/cyrus-cvs/imap/imapd.c
branches/cvsmerge/cyrus-cvs/imap/mboxlist.c
Modified: branches/cvsmerge/cyrus-cvs/imap/imapd.c
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/imap/imapd.c?rev=452&root=cyrus22&r1=451&r2=452&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/imap/imapd.c (original)
+++ branches/cvsmerge/cyrus-cvs/imap/imapd.c Fri May 12 11:50:36 2006
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: imapd.c,v 1.499 2006/04/07 19:58:16 murch Exp $ */
+/* $Id: imapd.c,v 1.500 2006/05/10 15:41:44 murch Exp $ */
#include <config.h>
@@ -3952,11 +3952,6 @@
}
}
- /* verify that the mailbox doesn't have a wildcard in it */
- for (p = oldmailboxname; !r && *p; p++) {
- if (*p == '*' || *p == '%') r = IMAP_MAILBOX_BADNAME;
- }
-
/* attempt to rename the base mailbox */
if (!r) {
r = mboxlist_renamemailbox(oldmailboxname, newmailboxname, partition,
Modified: branches/cvsmerge/cyrus-cvs/imap/mboxlist.c
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/imap/mboxlist.c?rev=452&root=cyrus22&r1=451&r2=452&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/imap/mboxlist.c (original)
+++ branches/cvsmerge/cyrus-cvs/imap/mboxlist.c Fri May 12 11:50:36 2006
@@ -40,7 +40,7 @@
*
*/
/*
- * $Id: mboxlist.c,v 1.241 2005/11/22 18:20:51 murch Exp $
+ * $Id: mboxlist.c,v 1.242 2006/05/10 15:41:52 murch Exp $
*/
#include <config.h>
@@ -475,10 +475,6 @@
/* Disallow creating user.X.* when no user.X */
free(acl);
return IMAP_PERMISSION_DENIED;
- }
- /* disallow wildcards in userids with inboxes. */
- if (strchr(mbox, '*') || strchr(mbox, '%') || strchr(mbox, '?')) {
- return IMAP_MAILBOX_BADNAME;
}
/*
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list