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 bbd5ef17ac5e45a87e7dae4d6f573a83d2e209f5..57067c6f75f3b51fdc21ca498d10d1bdb29971f8 100644 (file)
--- 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