steffen: server/imapd imapd-goodchars.diff,NONE,1.1

cvs at intevation.de cvs at intevation.de
Thu Apr 21 00:40:50 CEST 2005


Author: steffen

Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv19340

Added Files:
	imapd-goodchars.diff 
Log Message:
"GOODCHAR" patch from Wesley Craig <wes at umich.edu> in for testing (issue571)

--- NEW FILE: imapd-goodchars.diff ---
--- cyrus-imapd-2.2.10/imap/imapd.c	2004-11-17 17:29:03.000000000 -0500
+++ cyrus-imapd-2.2.10p0/imap/imapd.c	2004-12-06 15:23:59.000000000 -0500
@@ -3920,10 +3920,12 @@
 	}
     }
 
+#ifdef notdef
     /* verify that the mailbox doesn't have a wildcard in it */
     for (p = oldmailboxname; !r && *p; p++) {
 	if (*p == '*' || *p == '%') r = IMAP_MAILBOX_BADNAME;
     }
+#endif
 
     /* attempt to rename the base mailbox */
     if (!r) {

--- cyrus-imapd-2.2.10/imap/mboxlist.c	2004-07-26 14:08:03.000000000 -0400
+++ cyrus-imapd-2.2.10p0/imap/mboxlist.c	2004-12-06 15:23:59.000000000 -0500
@@ -476,10 +476,12 @@
 		free(acl);
 		return IMAP_PERMISSION_DENIED;
 	    }
+#ifdef notdef
 	    /* disallow wildcards in userids with inboxes. */	     
 	    if (strchr(mbox, '*') || strchr(mbox, '%') || strchr(mbox, '?')) {
 		return IMAP_MAILBOX_BADNAME;
 	    }
+#endif
 
 	    /*
 	     * Users by default have all access to their personal mailbox(es),
--- cyrus-imapd-2.2.10/imap/mboxname.c	2004-07-13 11:02:08.000000000 -0400
+++ cyrus-imapd-2.2.10p0/imap/mboxname.c	2004-12-06 15:23:59.000000000 -0500
@@ -624,8 +624,13 @@
 /*
  * Apply site policy restrictions on mailbox names.
  * Restrictions are hardwired for now.
- */
+
+ * original definition 
 #define GOODCHARS " +,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"
+ */
+
+#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+
 int mboxname_policycheck(char *name)
 {
     unsigned i;





More information about the commits mailing list