From 1de259e4d9c3c88996d01659932120a1c279e370 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sun, 29 Sep 2024 01:18:05 +0200
Subject: [PATCH] lib-sieve: sieve-script - Properly update event when script
name is modified
---
src/lib-sieve/sieve-script.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/lib-sieve/sieve-script.c b/src/lib-sieve/sieve-script.c
index 6a77e75a1..8e4fe78b2 100644
--- a/src/lib-sieve/sieve-script.c
+++ b/src/lib-sieve/sieve-script.c
@@ -197,13 +197,8 @@ int sieve_script_open(struct sieve_script *script,
i_assert(script->name != NULL);
script->open = TRUE;
- if (*script->name != '\0') {
- e_debug(script->event, "Opened script '%s' from '%s'",
- script->name, script->location);
- } else {
- e_debug(script->event, "Opened nameless script from '%s'",
- script->location);
- }
+ sieve_script_update_event(script);
+ e_debug(script->event, "Opened from '%s'", script->location);
return 0;
}
@@ -214,8 +209,9 @@ int sieve_script_open_as(struct sieve_script *script, const char *name,
return -1;
/* override name */
+ i_assert(name != NULL && *name != '\0');
script->name = p_strdup(script->pool, name);
- event_add_str(script->event, "script_name", name);
+ sieve_script_update_event(script);
return 0;
}
@@ -740,6 +736,7 @@ int sieve_script_rename(struct sieve_script *script, const char *newname)
if (ret >= 0) {
e_debug(event->event(), "Script renamed to '%s'", newname);
+ sieve_script_update_event(script);
} else {
event = event->add_str("error", storage->error);
--
GitLab