projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
eximconf.erb
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
bbd5ef1
..
57067c6
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 = '
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
demime = *
malware = */defer_ok
log_message = discarded malware message for $recipients