From: Stephen Gran <steve@lobefin.net>
Date: Thu, 30 Apr 2009 20:10:06 +0000 (+0100)
Subject: Add cert relay info to received header
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=32914a45a0ff60da0254a3f317149e00f5c88077;p=mirror%2Fdsa-puppet.git

Add cert relay info to received header
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/exim/files/common/exim4.conf b/modules/exim/files/common/exim4.conf
index 696901d17..1393727a6 100644
--- a/modules/exim/files/common/exim4.conf
+++ b/modules/exim/files/common/exim4.conf
@@ -216,6 +216,14 @@ smtp_enforce_sync = true
 
 log_selector = +tls_cipher +tls_peerdn +queue_time +deliver_time +smtp_connection +smtp_incomplete_transaction +smtp_confirmation
 
+received_header_text = Received: ${if def:sender_rcvhost {from $sender_rcvhost\n\t}
+                                 {${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}
+                                 ${if and {{eq {$tls_certificate_verified}{1}}{def:tls_peerdn}}{from $tls_peerdn\n\t}}
+                                 by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)\n\t}}
+                                 (Exim $version_number)\n\t
+                                 ${if def:sender_address {(envelope-from <$sender_address>)\n\t}}
+                                 id $message_exim_id${if def:received_for {\n\tfor $received_for}}
+
 # macro definitions.
 # Do not wrap!
 VDOMAINDATA = ${lookup{$domain}partial-lsearch{/etc/exim4/virtualdomains}{$value}}