From 4312e8bb27a135d1ba9f2c9f82b0b930015b6c3b Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Sat, 17 Jun 2017 14:25:16 +0100 Subject: [PATCH] [Fix] Try to deal with brain-damaged milter behaviour --- src/libserver/milter.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/libserver/milter.c b/src/libserver/milter.c index a564b3b2e..82996d01d 100644 --- a/src/libserver/milter.c +++ b/src/libserver/milter.c @@ -1214,6 +1214,12 @@ rspamd_milter_macro_http (struct rspamd_milter_session *session, rspamd_http_message_add_header_len (msg, QUEUE_ID_HEADER, found->begin, found->len); } + else { + IF_MACRO("i") { + rspamd_http_message_add_header_len (msg, QUEUE_ID_HEADER, + found->begin, found->len); + } + } IF_MACRO("{daemon_name}") { rspamd_http_message_add_header_len (msg, MTA_TAG_HEADER, @@ -1224,6 +1230,12 @@ rspamd_milter_macro_http (struct rspamd_milter_session *session, rspamd_http_message_add_header_len (msg, USER_AGENT_HEADER, found->begin, found->len); } + else { + IF_MACRO("v") { + rspamd_http_message_add_header_len (msg, USER_AGENT_HEADER, + found->begin, found->len); + } + } IF_MACRO("{cipher}") { rspamd_http_message_add_header_len (msg, TLS_CIPHER_HEADER, @@ -1258,6 +1270,12 @@ rspamd_milter_macro_http (struct rspamd_milter_session *session, rspamd_http_message_add_header_len (msg, MTA_NAME_HEADER, found->begin, found->len); } + else { + IF_MACRO("j") { + rspamd_http_message_add_header_len (msg, MTA_NAME_HEADER, + found->begin, found->len); + } + } } } -- 2.39.5