From 7e6a0eccd9646dd840158e162013a7a9bdb24cc9 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Mon, 20 Oct 2008 01:57:36 +0200
Subject: [PATCH] Fixed context handling bug in the result execution.
---
src/lib-sieve/sieve-result.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib-sieve/sieve-result.c b/src/lib-sieve/sieve-result.c
index ba406a210..43fd5fd6b 100644
--- a/src/lib-sieve/sieve-result.c
+++ b/src/lib-sieve/sieve-result.c
@@ -670,7 +670,7 @@ int sieve_result_execute
/* Execute the action itself */
if ( act->execute != NULL ) {
- rac->success = act->execute(act, &result->action_env, context);
+ rac->success = act->execute(act, &result->action_env, rac->tr_context);
success = success && rac->success;
}
@@ -704,7 +704,7 @@ int sieve_result_execute
bool keep = TRUE;
if ( act->commit != NULL )
- commit_ok = act->commit(act, &result->action_env, context, &keep) &&
+ commit_ok = act->commit(act, &result->action_env, rac->tr_context, &keep) &&
commit_ok;
/* Execute post_commit event of side effects */
@@ -721,7 +721,7 @@ int sieve_result_execute
implicit_keep = implicit_keep && keep;
} else {
if ( act->rollback != NULL )
- act->rollback(act, &result->action_env, context, rac->success);
+ act->rollback(act, &result->action_env, rac->tr_context, rac->success);
/* Rollback side effects */
rsef = rac->seffects != NULL ? rac->seffects->first_effect : NULL;
--
GitLab