dovecot-2.2: maildir: If istream_opened is set by a plugin, don'...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/3b9935fe9cb7
changeset: 17199:3b9935fe9cb7
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Apr 04 01:23:29 2014 +0300
description:
maildir: If istream_opened is set by a plugin, don't try to fix S=size by renaming.
Although this could be fixed in a nicer way by actually calculating the
correct S=size and using that for renaming.

diffstat:

 src/lib-storage/index/maildir/maildir-mail.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r 95ae49692ccb -r 3b9935fe9cb7 src/lib-storage/index/maildir/maildir-mail.c
--- a/src/lib-storage/index/maildir/maildir-mail.c	Fri Apr 04 01:03:17 2014 +0300
+++ b/src/lib-storage/index/maildir/maildir-mail.c	Fri Apr 04 01:23:29 2014 +0300
@@ -695,12 +695,14 @@
 					enum mail_fetch_field field)
 {
 	struct maildir_mailbox *mbox = (struct maildir_mailbox *)mail->box;
+	struct mail_private *pmail = (struct mail_private *)mail;
 	enum maildir_uidlist_rec_flag flags;
 	const char *fname;
 	uoff_t size;
 	char wrong_key;
 
-	if (mbox->storage->set->maildir_broken_filename_sizes) {
+	if (mbox->storage->set->maildir_broken_filename_sizes ||
+	    pmail->v.istream_opened != NULL) {
 		/* never try to fix sizes in maildir filenames */
 		return;
 	}