From 19afb90db2d67a43cde5959e211134cf4231f624 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Tue, 14 Dec 2021 16:25:19 +0000 Subject: [PATCH] [Minor] Update invocation --- src/client/rspamc.c | 4 ++-- src/libserver/protocol.c | 24 ++++++++++++++++-------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/client/rspamc.c b/src/client/rspamc.c index 4bb632121..3760c62e0 100644 --- a/src/client/rspamc.c +++ b/src/client/rspamc.c @@ -1383,8 +1383,8 @@ rspamc_mime_output (FILE *out, ucl_object_t *result, GString *input, g_string_erase (symbuf, symbuf->len - 1, 1); } - folded_symbuf = rspamd_header_value_fold ("X-Spam-Symbols", - symbuf->str, + folded_symbuf = rspamd_header_value_fold ("X-Spam-Symbols", strlen ("X-Spam-Symbols"), + symbuf->str, symbuf->len, 0, nl_type, ","); rspamd_printf_gstring (added_headers, "X-Spam-Symbols: %v%s", folded_symbuf, line_end); diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c index 65d0900df..eb82a743f 100644 --- a/src/libserver/protocol.c +++ b/src/libserver/protocol.c @@ -1512,12 +1512,16 @@ rspamd_protocol_write_ucl (struct rspamd_task *task, if (task->protocol_flags & RSPAMD_TASK_PROTOCOL_FLAG_MILTER || !task->message) { - folded_header = rspamd_header_value_fold ("DKIM-Signature", - dkim_sig->str, 80, RSPAMD_TASK_NEWLINES_LF, NULL); + folded_header = rspamd_header_value_fold ( + "DKIM-Signature", strlen ("DKIM-Signature"), + dkim_sig->str, dkim_sig->len, + 80, RSPAMD_TASK_NEWLINES_LF, NULL); } else { - folded_header = rspamd_header_value_fold ("DKIM-Signature", - dkim_sig->str, 80, + folded_header = rspamd_header_value_fold ( + "DKIM-Signature", strlen ("DKIM-Signature"), + dkim_sig->str, dkim_sig->len, + 80, MESSAGE_FIELD (task, nlines_type), NULL); } @@ -1539,12 +1543,16 @@ rspamd_protocol_write_ucl (struct rspamd_task *task, dkim_sig = (GString *) dkim_sigs->data; if (task->protocol_flags & RSPAMD_TASK_PROTOCOL_FLAG_MILTER) { - folded_header = rspamd_header_value_fold ("DKIM-Signature", - dkim_sig->str, 80, RSPAMD_TASK_NEWLINES_LF, NULL); + folded_header = rspamd_header_value_fold ( + "DKIM-Signature", strlen ("DKIM-Signature"), + dkim_sig->str, dkim_sig->len, + 80, RSPAMD_TASK_NEWLINES_LF, NULL); } else { - folded_header = rspamd_header_value_fold ("DKIM-Signature", - dkim_sig->str, 80, MESSAGE_FIELD (task, nlines_type), + folded_header = rspamd_header_value_fold ( + "DKIM-Signature", strlen ("DKIM-Signature"), + dkim_sig->str, dkim_sig->len, + 80, MESSAGE_FIELD (task, nlines_type), NULL); } -- 2.39.5