/[pkg-listmaster]/trunk/amavis/bin/amavisd-new
ViewVC logotype

Diff of /trunk/amavis/bin/amavisd-new

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 21 by zobel, Wed Sep 26 08:51:02 2007 UTC revision 22 by zobel, Wed Sep 26 09:25:14 2007 UTC
# Line 259  BEGIN { Line 259  BEGIN {
259        $enable_ldap $default_ldap        $enable_ldap $default_ldap
260        @keep_decoded_original_maps @map_full_type_to_short_type_maps        @keep_decoded_original_maps @map_full_type_to_short_type_maps
261        @viruses_that_fake_sender_maps %banned_rules        @viruses_that_fake_sender_maps %banned_rules
262        $file %recipient_policy_bank_map        $file %recipient_policy_bank_map $sa_site_rules_filename
263      )],      )],
264      'sa' => [qw(      'sa' => [qw(
265        $helpers_home $dspam        $helpers_home $dspam
# Line 13206  sub spam_scan($$) { Line 13206  sub spam_scan($$) {
13206        # *** note that $sa_version could be 3.0.1, which is not really numeric!        # *** note that $sa_version could be 3.0.1, which is not really numeric!
13207        if ($sa_version=~/^(\d+(?:\.\d+)?)/ && $1 >= 3) {        if ($sa_version=~/^(\d+(?:\.\d+)?)/ && $1 >= 3) {
13208          my($pbname) = c('policy_bank_name');          my($pbname) = c('policy_bank_name');
13209            my ($rule_name) = c('sa_site_rules_filename');
13210          $pbname =~ s/^pb_//;          $pbname =~ s/^pb_//;
13211          $spamassassin_obj->read_scoreonly_config ('/etc/spamassassin/multiconf/10_' . $pbname . ".cf");          if ($rule_name) {
13212                    $spamassassin_obj->read_scoreonly_config ($rule_name);
13213            } else {
13214                    $spamassassin_obj->read_scoreonly_config ('/etc/spamassassin/multiconf/10_' . $pbname . ".cf");
13215            }
13216          $mail_obj = $spamassassin_obj->parse(\@lines);          $mail_obj = $spamassassin_obj->parse(\@lines);
13217        } else {  # 2.63 or earlier        } else {  # 2.63 or earlier
13218          $mail_obj = Mail::SpamAssassin::NoMailAudit->new(data => \@lines,          $mail_obj = Mail::SpamAssassin::NoMailAudit->new(data => \@lines,

Legend:
Removed from v.21  
changed lines
  Added in v.22

  ViewVC Help
Powered by ViewVC 1.1.5