kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upon continuing the deferred implicit keep, the implicit side-effects

Browse source 
(such as imap flags) were not applied.

Obtained from:	3e1a17a286
Approved by: adamw (mentor, implicit)
This commit is contained in:
Larry Rosenman 2017-04-28 18:12:06 +00:00
parent 0ba4b5cd11
commit 17bb3074c1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=439618
2 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mail/dovecot2-pigeonhole/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= dovecot-pigeonhole
PORTVERSION= 0.4.18
PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}

42
mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c Normal file
View file

@ -0,0 +1,42 @@
From 3e1a17a286ab0e084577fc267a442cb12aed1cbc Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Fri, 28 Apr 2017 00:02:39 +0200
Subject: [PATCH] lib-sieve: Fixed bug in handling of deferred implicit keep
with implicit side-effects.
Upon continuing the deferred implicit keep, the implicit side-effects (such as imap flags) were not applied.
---
src/lib-sieve/sieve-result.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/lib-sieve/sieve-result.c b/src/lib-sieve/sieve-result.c
index 3c896f2..fc75063 100644
--- src/lib-sieve/sieve-result.c
+++ src/lib-sieve/sieve-result.c
@@ -969,7 +969,14 @@ static int _sieve_result_implicit_keep
rac = rac->next;
}
+ } else if ( !rollback ) {
+ act_keep.location = kac->action.location;
+ act_keep.mail = kac->action.mail;
+ if ( kac->seffects != NULL )
+ rsef_first = kac->seffects->first_effect;
+ }
+ if (rsef_first == NULL) {
/* Apply any implicit side effects if applicable */
if ( !rollback && hash_table_is_created(result->action_contexts) ) {
struct sieve_result_action_context *actctx;
@@ -980,11 +987,6 @@ static int _sieve_result_implicit_keep
if ( actctx != NULL && actctx->seffects != NULL )
rsef_first = actctx->seffects->first_effect;
}
- } else if ( !rollback ) {
- act_keep.location = kac->action.location;
- act_keep.mail = kac->action.mail;
- if ( kac->seffects != NULL )
- rsef_first = kac->seffects->first_effect;
}
/* Start keep action */