Browse Source

[Minor] Update invocation

tags/3.2
Vsevolod Stakhov 2 years ago
parent
commit
19afb90db2
2 changed files with 18 additions and 10 deletions
  1. 2
    2
      src/client/rspamc.c
  2. 16
    8
      src/libserver/protocol.c

+ 2
- 2
src/client/rspamc.c View File

g_string_erase (symbuf, symbuf->len - 1, 1); 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, ","); 0, nl_type, ",");
rspamd_printf_gstring (added_headers, "X-Spam-Symbols: %v%s", rspamd_printf_gstring (added_headers, "X-Spam-Symbols: %v%s",
folded_symbuf, line_end); folded_symbuf, line_end);

+ 16
- 8
src/libserver/protocol.c View File

if (task->protocol_flags & RSPAMD_TASK_PROTOCOL_FLAG_MILTER || if (task->protocol_flags & RSPAMD_TASK_PROTOCOL_FLAG_MILTER ||
!task->message) { !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 { 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), MESSAGE_FIELD (task, nlines_type),
NULL); NULL);
} }
dkim_sig = (GString *) dkim_sigs->data; dkim_sig = (GString *) dkim_sigs->data;


if (task->protocol_flags & RSPAMD_TASK_PROTOCOL_FLAG_MILTER) { 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 { 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); NULL);
} }



Loading…
Cancel
Save