From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 24 Jul 2009 09:25:29 +0000 (+0200)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2b9cbadfcb9b2f3b9a59f2920037985e80be65af;hp=15e55ed5e755b65e7ea8c43a6a17cdcffae01da4;p=dsa-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:
  Hi, my name is Steve, and I can read
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index bbd5ef17..57067c6f 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -982,7 +982,7 @@ out
 out = ""
 if has_variable?("clamd") && clamd == "true"
 out = '
-  discard condition       = ${if eq {$acl_m_prf}{blackhole}{no}{yes}}
+  discard condition       = ${if eq {$acl_m_prf}{blackhole}}
           demime          = *
           malware         = */defer_ok
           log_message     = discarded malware message for $recipients