[Minor] Utilise {rcpt_mailer} macro in milter mode

Issue: #2151

diff --git a/src/libserver/milter.c b/src/libserver/milter.c
index 010f2215ab22ca57c72eeff1c68b4c5738e2f59a..3f3772850e7b7b690d67a2ca883d44b162e8be43 100644 (file)
--- 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 7f12e388394196a5e46e7521181ade7dfd9cbe67..83d7afdf87b3a1be044475063c4e5dab30d22ae5 100644 (file)
--- 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 42552f78936426ad38d3b99d21bf1dde87f4e83a..756b9f68aa948ae131ac3c8cd456294d242ba24d 100644 (file)
--- 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