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:
  Revert "A few more recipient callout statements"
  Revert "Use recipient callouts"
  A few more recipient callout statements
  This seems to misevaluate sometimes.  Explicitly cast to a digit
  Use recipient callouts

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index f867c3d..552b03a 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -640,7 +640,7 @@ out
           !verify        = sender
 
   defer   !hosts         = +debianhosts
-          condition      = ${if >{${eval:$acl_c_scr}}{0}}
+          condition      = ${if >{${eval:$acl_c_scr+0}}{0}}
           ratelimit      = 10 / 60m / per_rcpt / $sender_host_address
           message        = slow down (no reverse dns, mismatched ehlo, dialup, or in blacklists)
 <%=