From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 31 May 2017 09:36:36 +0000 (+0100)
Subject: [Minor] Add workaround for Postfix hostname
X-Git-Tag: 1.6.0~92
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=aa7679b9dfc18ba4c5f41d2b4c781d79cc48d4d5;p=rspamd.git

[Minor] Add workaround for Postfix hostname
---

diff --git a/src/libserver/milter.c b/src/libserver/milter.c
index d739a9d5e..6d2c7508b 100644
--- a/src/libserver/milter.c
+++ b/src/libserver/milter.c
@@ -290,6 +290,11 @@ rspamd_milter_process_command (struct rspamd_milter_session *session,
 			guchar proto;
 			guint16 port;
 
+			/*
+			 * Important notice: Postfix do NOT use this command to pass
+			 * client's info (e.g. hostname is not really here)
+			 * Sendmail will pass it here
+			 */
 			if (session->hostname == NULL) {
 				session->hostname = rspamd_fstring_new_init (pos, zero - pos);
 			}
@@ -1185,6 +1190,13 @@ rspamd_milter_macro_http (struct rspamd_milter_session *session,
 		rspamd_http_message_add_header_len (msg, USER_HEADER,
 				found->begin, found->len);
 	}
+
+	if (!session->hostname || session->hostname->len == 0) {
+		IF_MACRO("{client_name}") {
+			rspamd_http_message_add_header_len (msg, HOSTNAME_HEADER,
+					found->begin, found->len);
+		}
+	}
 }
 
 struct rspamd_http_message *