From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 30 Apr 2009 20:20:30 +0000 (+0200)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=338a66becb884da33ef341815646478ec9ae1c21;hp=2f9ba43fd75b2743d148873b6f6d387745ae0501;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Mention that we verified the cert
---

diff --git a/modules/exim/files/common/exim4.conf b/modules/exim/files/common/exim4.conf
index 4b048612e..26464c2ac 100644
--- a/modules/exim/files/common/exim4.conf
+++ b/modules/exim/files/common/exim4.conf
@@ -218,7 +218,7 @@ log_selector = +tls_cipher +tls_peerdn +queue_time +deliver_time +smtp_connectio
 
 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}}\
+                                 ${if and {{eq {$tls_certificate_verified}{1}}{def:tls_peerdn}}{from $tls_peerdn (verified)\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}}\