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

diff --combined modules/exim/templates/eximconf.erb
index 8762026,764e5fe..bb1808a
--- 1/modules/exim/templates/eximconf.erb
--- 2/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@@ -367,13 -367,6 +367,13 @@@ ou
  
    accept  condition      = ${if eq {$acl_m_rprf}{}{no}{yes}}
  
 +  warn    domains        = +virtual_domains
 +          condition      = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/mail-contentinspectionaction}}}}
 +          condition      = ${if eq{${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/mail-contentinspectionaction}}}{$value}{}}}{markup}}
 +          set acl_m_rprf = markup
 +
 +  accept  condition      = ${if eq {$acl_m_rprf}{}{no}{yes}}
 +
    warn    condition      = ${if eq{${lookup{$local_part}cdb{/var/lib/misc/${primary_hostname}/mail-contentinspectionaction.cdb}{$value}{}}}{markup}}
            set acl_m_rprf = markup
  
@@@ -383,13 -376,6 +383,13 @@@
            set acl_m_rprf = blackhole
  
    accept  condition      = ${if eq {$acl_m_rprf}{}{no}{yes}}
 +
 +  warn    domains        = +virtual_domains
 +          condition      = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/mail-contentinspectionaction}}}}
 +          condition      = ${if eq{${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/mail-contentinspectionaction}}}{$value}{}}}{blackhole}}
 +          set acl_m_rprf = blackhole
 +
 +  accept  condition      = ${if eq {$acl_m_rprf}{}{no}{yes}}
  
    warn    set acl_m_rprf = normal
  
@@@ -885,7 -871,7 +885,7 @@@ acl_check_mime
           condition     = ${if eq {$acl_m_prf}{markup}}
           set acl_m_srb = ${perl{surblspamcheck}}
           condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
-          message       = X-Surbl-Hit: $acl_m_srb
+          message       = X-Surbl-Hit: $primary_hostname: $acl_m_srb
  
    accept condition     = ${if eq {$acl_m_prf}{markup}}
  
@@@ -988,7 -974,7 +988,7 @@@ out=
           condition     = ${if eq {$acl_m_prf}{markup}}
           set acl_m_srb = ${perl{surblspamcheck}}
           condition     = ${if eq{$acl_m_srb}{false}{no}{yes}}
-          message       = X-Surbl-Hit: $acl_m_srb
+          message       = X-Surbl-Hit: $primary_hostname: $acl_m_srb
  
    accept condition     = ${if eq {$acl_m_prf}{markup}}