Attachment #176760 for bug #214302

View | Details | Raw Unified | Return to bug 214302
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-1 / +1 lines)
3		3
4	PORTNAME= dovecot-pigeonhole	4	PORTNAME= dovecot-pigeonhole
5	PORTVERSION= 0.4.16	5	PORTVERSION= 0.4.16
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/	8	MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
9	DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}	9	DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}




--- src/plugins/imapsieve/imap-sieve-storage.c.orig	2016-11-08 02:19:04 UTC
+++ src/plugins/imapsieve/imap-sieve-storage.c
@@ -531,7 +531,8 @@ imap_sieve_mailbox_transaction_begin(str
 	/* commence parent transaction */
 	t = lbox->super.transaction_begin(box, flags);
 
-	if (isuser == NULL || isuser->sieve_active)
+	if (isuser == NULL || isuser->sieve_active ||
+		isuser->cur_cmd == IMAP_SIEVE_CMD_NONE)
 		return t;
 
 	i_assert(isuser->client != NULL);

Return to bug 214302

Line 0 Link Here

(-)files/patch-src_plugins_imapsieve_imap-sieve-storage.c (+12 lines)
	1	--- src/plugins/imapsieve/imap-sieve-storage.c.orig 2016-11-08 02:19:04 UTC
	2	+++ src/plugins/imapsieve/imap-sieve-storage.c
	3	@@ -531,7 +531,8 @@ imap_sieve_mailbox_transaction_begin(str
	4	/* commence parent transaction */
	5	t = lbox->super.transaction_begin(box, flags);
	6
	7	- if (isuser == NULL \|\| isuser->sieve_active)
	8	+ if (isuser == NULL \|\| isuser->sieve_active \|\|
	9	+ isuser->cur_cmd == IMAP_SIEVE_CMD_NONE)
	10	return t;
	11
	12	i_assert(isuser->client != NULL);