[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-save.c, 1.93, 1.94 mbox-storage.c, 1.143, 1.144 mbox-sync.c, 1.180, 1.181

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv27204/lib-storage/index/mbox

Modified Files:
	mbox-save.c mbox-storage.c mbox-sync.c 
Log Message:
If mailbox was opened with readonly-flag, don't really force it. Fixes
EXAMINE box + APPEND box.



Index: mbox-save.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-save.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- mbox-save.c	26 Feb 2006 10:05:22 -0000	1.93
+++ mbox-save.c	14 Apr 2006 11:14:08 -0000	1.94
@@ -269,7 +269,7 @@
 	struct mbox_mailbox *mbox = ctx->mbox;
 	int ret;
 
-	if (ctx->mbox->mbox_readonly || ctx->mbox->ibox.readonly) {
+	if (ctx->mbox->mbox_readonly) {
 		mail_storage_set_error(STORAGE(ctx->mbox->storage),
 				       "Read-only mbox");
 		return -1;

Index: mbox-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-storage.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- mbox-storage.c	13 Apr 2006 21:13:50 -0000	1.143
+++ mbox-storage.c	14 Apr 2006 11:14:08 -0000	1.144
@@ -1041,7 +1041,7 @@
 
 	hdr = mail_index_get_header(mbox->ibox.view);
 	if ((hdr->flags & MAIL_INDEX_HDR_FLAG_HAVE_DIRTY) != 0 &&
-	    !mbox->ibox.readonly && !mbox->mbox_readonly) {
+	    !mbox->mbox_readonly) {
 		/* we've done changes to mbox which haven't been written yet.
 		   do it now. */
 		if (mbox_sync(mbox, MBOX_SYNC_REWRITE) < 0)

Index: mbox-sync.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync.c,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- mbox-sync.c	14 Jan 2006 18:47:52 -0000	1.180
+++ mbox-sync.c	14 Apr 2006 11:14:08 -0000	1.181
@@ -1546,7 +1546,7 @@
 	int ret, changed;
 	bool delay_writes;
 
-	delay_writes = mbox->ibox.readonly ||
+	delay_writes = mbox->mbox_readonly ||
 		((flags & MBOX_SYNC_REWRITE) == 0 &&
 		 getenv("MBOX_LAZY_WRITES") != NULL);