Thanks Mark!
> Try this one, adds @spam_notifyadmin_cutoff_level_maps :
>
It works. Thank you very much.
Would there be a chance to incorporate this upstream?
I only needed to change the location of the last hunk.
--- amavisd-new.orig 2009-05-27 08:27:29.000000000 +0200
+++ amavisd-new 2009-05-27 08:28:49.000000000 +0200
@@ -318,7 +318,7 @@
@spam_dsn_cutoff_level_maps @spam_dsn_cutoff_level_bysender_maps
@spam_crediblefrom_dsn_cutoff_level_maps
@spam_crediblefrom_dsn_cutoff_level_bysender_maps
- @spam_quarantine_cutoff_level_maps
+ @spam_quarantine_cutoff_level_maps @spam_notifyadmin_cutoff_level_maps
@whitelist_sender_maps @blacklist_sender_maps @score_sender_maps
@author_to_policy_bank_maps @signer_reputation_maps
@message_size_limit_maps @debug_sender_maps
@@ -450,7 +450,8 @@
$keep_decoded_original_re $map_full_type_to_short_type_re
$banned_filename_re $viruses_that_fake_sender_re
$sa_tag_level_deflt $sa_tag2_level_deflt $sa_tag3_level_deflt
- $sa_kill_level_deflt $sa_quarantine_cutoff_level
+ $sa_kill_level_deflt
+ $sa_quarantine_cutoff_level @spam_notifyadmin_cutoff_level_maps
$sa_dsn_cutoff_level $sa_crediblefrom_dsn_cutoff_level
$sa_spam_modifies_subj $sa_spam_subject_tag1 $sa_spam_subject_tag
%whitelist_sender @whitelist_sender_acl $whitelist_sender_re
@@ -1606,7 +1607,7 @@
@spam_tag_level_maps @spam_tag2_level_maps @spam_tag3_level_maps
@spam_kill_level_maps @spam_modifies_subj_maps
@spam_dsn_cutoff_level_maps @spam_dsn_cutoff_level_bysender_maps
- @spam_quarantine_cutoff_level_maps
+ @spam_quarantine_cutoff_level_maps @spam_notifyadmin_cutoff_level_maps
@spam_subject_tag_maps @spam_subject_tag2_maps @spam_subject_tag3_maps
@whitelist_sender_maps @blacklist_sender_maps @score_sender_maps
@author_to_policy_bank_maps @signer_reputation_maps
@@ -11810,6 +11811,21 @@
push(@q_addr, $q) if defined $q && $q ne '' && !grep {$_ eq
$q} @q_addr;
}
($a) = lookup(0,$rec,@$admin_maps_ref) if $admin_maps_ref;
+ if (defined $a && $a ne '' &&
+ ($rec_ccat_maj==CC_SPAM || $rec_ccat_maj==CC_SPAMMY)) {
+ # consider suppressing spam admin notifications
+ my($cutoff) = lookup2(0,$rec,
ca('spam_notifyadmin_cutoff_level_maps'));
+ if (!defined $cutoff || $cutoff eq '') {
+ # no cutoff, sending administrator notifications
+ } elsif ($blacklisted && !$whitelisted) {
+ do_log(2,"do_notify_and_quarantine: spam admin cutoff, blacklisted");
+ $a = ''; # disable admin notification on behalf of this recipient
+ } elsif ($spam_level_boosted >= $cutoff) {
+ do_log(2,"do_notify_and_quarantine: spam level exceeds ".
+ "spam admin cutoff level %s", $cutoff);
+ $a = ''; # disable admin notification on behalf of this recipient
+ }
+ }
push(@a_addr, $a) if defined $a && $a ne '' && !grep {$_ eq $a} @a_addr;
if (ccat_maj($r->contents_category)==CC_VIRUS &&
$newvirus_admin_maps_ref){
($a) = lookup(0,$rec,@$newvirus_admin_maps_ref);
--
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
Rudy Gevaert [email protected] tel:+32 9 264 4734
Directie ICT, afd. Infrastructuur Direction ICT, Infrastructure dept.
Groep Systemen Systems group
Universiteit Gent Ghent University
Krijgslaan 281, gebouw S9, 9000 Gent, Belgie www.UGent.be
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp as they present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com
_______________________________________________
AMaViS-user mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/amavis-user
AMaViS-FAQ:http://www.amavis.org/amavis-faq.php3
AMaViS-HowTos:http://www.amavis.org/howto/
