[SVN] r686 - in /branches/cvsmerge/cyrus-cvs: imap/CVS/Entries imap/imapd.c lib/CVS/Entries lib/acl.h

[debian at incase.de]

Author: sven
Date: Mon Nov 13 19:29:53 2006
New Revision: 686

URL: https://mail.incase.de/viewcvs?rev=686&root=cyrus22&view=rev
Log:
Upstream CVS update

Modified:
    branches/cvsmerge/cyrus-cvs/imap/CVS/Entries
    branches/cvsmerge/cyrus-cvs/imap/imapd.c
    branches/cvsmerge/cyrus-cvs/lib/CVS/Entries
    branches/cvsmerge/cyrus-cvs/lib/acl.h

Modified: branches/cvsmerge/cyrus-cvs/imap/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/imap/CVS/Entries?rev=686&root=cyrus22&r1=685&r2=686&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/imap/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/imap/CVS/Entries Mon Nov 13 19:29:53 2006
@@ -32,7 +32,6 @@
 /idled.c/1.23/Thu Feb  9 19:29:40 2006//
 /idled.h/1.4/Thu Feb  9 19:29:40 2006//
 /imap_err.et/1.52/Thu Feb  9 19:29:40 2006//
-/imapd.c/1.500/Fri May 12 09:50:36 2006//
 /imapd.h/1.62/Thu Feb  9 19:29:40 2006//
 /imapparse.c/1.15/Thu Feb  9 19:29:40 2006//
 /index.c/1.218/Thu Feb  9 19:29:40 2006//
@@ -115,4 +114,5 @@
 /version.c/1.19/Thu Feb  9 19:29:40 2006//
 /version.h/1.140/Wed May  3 15:43:58 2006//
 /xversion.sh/1.7/Thu Feb  9 19:29:40 2006//
+/imapd.c/1.501/Mon Nov 13 18:06:49 2006//
 D

Modified: branches/cvsmerge/cyrus-cvs/imap/imapd.c
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/imap/imapd.c?rev=686&root=cyrus22&r1=685&r2=686&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/imap/imapd.c (original)
+++ branches/cvsmerge/cyrus-cvs/imap/imapd.c Mon Nov 13 19:29:53 2006
@@ -38,7 +38,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: imapd.c,v 1.500 2006/05/10 15:41:44 murch Exp $ */
+/* $Id: imapd.c,v 1.501 2006/11/13 16:17:52 murch Exp $ */
 
 #include <config.h>
 
@@ -2643,7 +2643,7 @@
 
     /* Examine command puts mailbox in read-only mode */
     if (cmd[0] == 'E') {
-	imapd_mailbox->myrights &= ~(ACL_SEEN|ACL_WRITE|ACL_DELETE);
+	imapd_mailbox->myrights &= ~ACL_READ_WRITE;
     }
 
     if (imapd_mailbox->myrights & ACL_DELETE) {
@@ -2682,7 +2682,7 @@
     }
 
     prot_printf(imapd_out, "%s OK [READ-%s] %s\r\n", tag,
-	   (imapd_mailbox->myrights & (ACL_WRITE|ACL_DELETE)) ?
+	   (imapd_mailbox->myrights & ACL_READ_WRITE) ?
 		"WRITE" : "ONLY", error_message(IMAP_OK_COMPLETED));
 
     proc_register("imapd", imapd_clienthost, imapd_userid, mailboxname);

Modified: branches/cvsmerge/cyrus-cvs/lib/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/lib/CVS/Entries?rev=686&root=cyrus22&r1=685&r2=686&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/lib/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/lib/CVS/Entries Mon Nov 13 19:29:53 2006
@@ -4,7 +4,6 @@
 /Makefile.dist/1.2/Thu Feb  9 19:29:40 2006//
 /Makefile.in/1.64/Thu Feb  9 19:29:40 2006//
 /acl.c/1.10/Thu Feb  9 19:29:40 2006//
-/acl.h/1.16/Thu Feb  9 19:29:40 2006//
 /acl_afs.c/1.25/Wed May  3 15:43:58 2006//
 /assert.c/1.18/Thu Feb  9 19:29:40 2006//
 /assert.h/1.10/Thu Feb  9 19:29:40 2006//
@@ -95,3 +94,4 @@
 /xstrlcat.h/1.1/Thu Feb  9 19:29:40 2006//
 /xstrlcpy.c/1.1/Thu Feb  9 19:29:40 2006//
 /xstrlcpy.h/1.1/Thu Feb  9 19:29:40 2006//
+/acl.h/1.17/Mon Nov 13 18:06:49 2006//

Modified: branches/cvsmerge/cyrus-cvs/lib/acl.h
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/lib/acl.h?rev=686&root=cyrus22&r1=685&r2=686&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/lib/acl.h (original)
+++ branches/cvsmerge/cyrus-cvs/lib/acl.h Mon Nov 13 19:29:53 2006
@@ -42,7 +42,7 @@
  * Start Date: 6/28/93
  */
 
-/* $Id: acl.h,v 1.16 2004/03/05 19:19:21 rjs3 Exp $ */
+/* $Id: acl.h,v 1.17 2006/11/13 16:17:53 murch Exp $ */
 
 #ifndef INCLUDED_ACL_H
 #define INCLUDED_ACL_H
@@ -74,6 +74,8 @@
 #define ACL_USER8  0x20000L
 #define ACL_USER9  0x40000L
 #define ACL_FULL   0xFFFFFL
+
+#define ACL_READ_WRITE	(ACL_SEEN|ACL_WRITE|ACL_INSERT|ACL_DELETE)
 
 #define ACL_MODE_SET 0
 #define ACL_MODE_ADD 1