From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 27 Apr 2018 18:29:28 +0000 (+0100)
Subject: [Minor] Utilise {rcpt_mailer} macro in milter mode
X-Git-Tag: 1.7.4~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d34197ef90dcc50a85c5e2029e03ec87a593edb;p=thirdparty%2Frspamd.git

[Minor] Utilise {rcpt_mailer} macro in milter mode

Issue: #2151
---

diff --git a/src/libserver/milter.c b/src/libserver/milter.c
index 010f2215ab..3f3772850e 100644
--- a/src/libserver/milter.c
+++ b/src/libserver/milter.c
@@ -1349,6 +1349,11 @@ rspamd_milter_macro_http (struct rspamd_milter_session *session,
 				found->begin, found->len);
 	}
 
+	IF_MACRO("{rcpt_mailer}") {
+		rspamd_http_message_add_header_len (msg, MAILER_HEADER,
+				found->begin, found->len);
+	}
+
 	if (milter_ctx->client_ca_name) {
 		IF_MACRO ("{cert_issuer}") {
 			rspamd_http_message_add_header_len (msg, CERT_ISSUER_HEADER,
diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 7f12e38839..83d7afdf87 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -497,7 +497,7 @@ rspamd_protocol_handle_headers (struct rspamd_task *task,
 				}
 				break;
 			default:
-				msg_debug_protocol ("unknown header: %V", hn);
+				msg_debug_protocol ("generic header: %V", hn);
 				break;
 			}
 
diff --git a/src/libserver/protocol_internal.h b/src/libserver/protocol_internal.h
index 42552f7893..756b9f68aa 100644
--- a/src/libserver/protocol_internal.h
+++ b/src/libserver/protocol_internal.h
@@ -82,5 +82,6 @@
 #define MILTER_HEADER "Milter"
 #define FILENAME_HEADER "Filename"
 #define CERT_ISSUER_HEADER "TLS-Cert-Issuer"
+#define MAILER_HEADER "Mailer"
 
 #endif //RSPAMD_PROTOCOL_INTERNAL_H