Skip to content
Snippets Groups Projects
Commit 93ad05b4 authored by Stephan Bosch's avatar Stephan Bosch
Browse files

lib-sieve: sieve-result - Record per-action error handler.

Makes sure it is consistent for a later commit when action exection is more fragmented.
parent 32b8af52
Loading
...@@ -36,6 +36,7 @@ struct event_category event_category_sieve_action = { ...@@ -36,6 +36,7 @@ struct event_category event_category_sieve_action = {
struct sieve_result_action { struct sieve_result_action {
struct sieve_action action; struct sieve_action action;
struct sieve_error_handler *ehandler;
void *tr_context; void *tr_context;
int status; int status;
...@@ -911,9 +912,11 @@ static void ...@@ -911,9 +912,11 @@ static void
sieve_action_execution_pre(struct sieve_result_execution *rexec, sieve_action_execution_pre(struct sieve_result_execution *rexec,
struct sieve_result_action *ract) struct sieve_result_action *ract)
{ {
if (ract->ehandler == NULL)
ract->ehandler = rexec->ehandler;
rexec->action_env.action = &ract->action; rexec->action_env.action = &ract->action;
rexec->action_env.event = ract->action.event; rexec->action_env.event = ract->action.event;
rexec->action_env.ehandler = rexec->ehandler; rexec->action_env.ehandler = ract->ehandler;
} }
static void static void
...@@ -1204,6 +1207,7 @@ sieve_result_implicit_keep_execute(struct sieve_result_execution *rexec, ...@@ -1204,6 +1207,7 @@ sieve_result_implicit_keep_execute(struct sieve_result_execution *rexec,
if (rexec->keep_equiv_action != NULL) if (rexec->keep_equiv_action != NULL)
return; return;
ract_keep->ehandler = rexec->ehandler;
rexec->keep_success = success; rexec->keep_success = success;
rexec->keep_status = status; rexec->keep_status = status;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Consent

On this website, we use the web analytics service Matomo to analyze and review the use of our website. Through the collected statistics, we can improve our offerings and make them more appealing for you. Here, you can decide whether to allow us to process your data and set corresponding cookies for these purposes, in addition to technically necessary cookies. Further information on data protection—especially regarding "cookies" and "Matomo"—can be found in our privacy policy. You can withdraw your consent at any time.