From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 15 Jul 2009 13:40:43 +0000 (+0200)
Subject: Add the hostname to the X-Surbl-Hit header
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4a2ae5257a6f534c3bd12a27ff9a9bc6b330aa2c;p=mirror%2Fdsa-puppet.git

Add the hostname to the X-Surbl-Hit header
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index ae82404b4..764e5feb2 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -871,7 +871,7 @@ acl_check_mime:
          condition     = ${if eq {$acl_m_prf}{markup}}
          set acl_m_srb = ${perl{surblspamcheck}}
          condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
-         message       = X-Surbl-Hit: $acl_m_srb
+         message       = X-Surbl-Hit: $primary_hostname: $acl_m_srb
 
   accept condition     = ${if eq {$acl_m_prf}{markup}}
 
@@ -974,7 +974,7 @@ out='
          condition     = ${if eq {$acl_m_prf}{markup}}
          set acl_m_srb = ${perl{surblspamcheck}}
          condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
-         message       = X-Surbl-Hit: $acl_m_srb
+         message       = X-Surbl-Hit: $primary_hostname: $acl_m_srb
 
   accept condition     = ${if eq {$acl_m_prf}{markup}}