From 999738b9980f4abf3da4e46c97fa841a18a783c0 Mon Sep 17 00:00:00 2001 From: Bron Gondwana Date: Mon, 30 Mar 2015 13:14:25 +1100 Subject: [PATCH 1/2] Don't send the "action strings" when notifying These strings are largely useful for debugging, not end user consumption. (This commit message was written by Ricardo Signes, replacing the previous internal Fastmail commit message. The code change is by Bron Gondwana.) --- sieve/script.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sieve/script.c b/sieve/script.c index 7f2b0349f9..4b877e0118 100644 --- a/sieve/script.c +++ b/sieve/script.c @@ -430,7 +430,7 @@ static int build_notify_message(sieve_interp_t *i, static int send_notify_callback(sieve_interp_t *interp, void *message_context, void *script_context, notify_list_t *notify, - char *actions_string, + char *actions_string __attribute__((unused)), const char **errmsg) { sieve_notify_context_t nc; @@ -462,7 +462,7 @@ static int send_notify_callback(sieve_interp_t *interp, build_notify_message(interp, notify->message, message_context, &out); buf_appendcstr(&out, "\n\n"); - buf_appendcstr(&out, actions_string); + /* buf_appendcstr(&out, actions_string); */ nc.message = buf_cstring(&out); nc.fname = NULL; From 31be83b1eb9c26a35fd2ab6cf7d9530bcab0bef1 Mon Sep 17 00:00:00 2001 From: Ricardo Signes Date: Wed, 11 Dec 2024 12:08:24 -0500 Subject: [PATCH 2/2] sieve/script.c: actually remove the actions_string param --- sieve/script.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sieve/script.c b/sieve/script.c index 4b877e0118..2393cbd816 100644 --- a/sieve/script.c +++ b/sieve/script.c @@ -430,7 +430,6 @@ static int build_notify_message(sieve_interp_t *i, static int send_notify_callback(sieve_interp_t *interp, void *message_context, void *script_context, notify_list_t *notify, - char *actions_string __attribute__((unused)), const char **errmsg) { sieve_notify_context_t nc; @@ -462,7 +461,6 @@ static int send_notify_callback(sieve_interp_t *interp, build_notify_message(interp, notify->message, message_context, &out); buf_appendcstr(&out, "\n\n"); - /* buf_appendcstr(&out, actions_string); */ nc.message = buf_cstring(&out); nc.fname = NULL; @@ -677,7 +675,7 @@ static int do_sieve_error(int ret, notify_ret = send_notify_callback(interp, message_context, script_context,n, - actions_string, &errmsg); + &errmsg); ret |= notify_ret; } n = n->next;