Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't send the "action strings" when notifying #5166

Merged
merged 1 commit into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions changes/next/notify_action_string
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Description:

Sieve notifications no longer include the "actions string".


Config changes:

None required.


Upgrade instructions:

Generally, none required. In the unlikely event that you required
notifications sent by Sieve to include the list of exact actions taken so far,
you may need to update that the expectations of downstream software.


GitHub issue:

None.
4 changes: 1 addition & 3 deletions sieve/script.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
const char **errmsg)
{
sieve_notify_context_t nc;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading