Better spam logging.
authorshort <>
Sat, 19 Feb 2005 16:44:31 +0000 (16:44 +0000)
committershort <>
Sat, 19 Feb 2005 16:44:31 +0000 (16:44 +0000)
PerlMail/Config.pm

index a8b0cd6..243a0d8 100644 (file)
@@ -302,17 +302,17 @@ sub audit
        # spam detection
        return if did sub {
                # Do not local $store_file as it is our-imported
-               $store_profile="silent";
+               $store_profile="log";
                local $_;
-               store "=spam;virus=$_"                    if $_=clamscan();
-               store "=spam".($_ eq 1 ? "" : ";$_")      if $_=spamassassin();
-               store "=spam"                      .";$_","log" if $_=dnsbl '.relays.ordb.org.' ,1;     # all hosts
-               store "=spam"                      .";$_","log" if $_=dnsbl '.blackholes.mail-abuse.org.' ,1;   # all hosts
+               store "=spam".";virus=$_"            if $_=clamscan();
+               store "=spam".($_ eq 1 ? "" : ";$_") if $_=spamassassin();
+               store "=spam".";$_"                  if $_=dnsbl '.relays.ordb.org.' ,1;        # all hosts
+               store "=spam".";$_"                  if $_=dnsbl '.blackholes.mail-abuse.org.' ,1;      # all hosts
                # we don't check all hosts as they can be "dialup" category, FIXME: check for it
-#              store "=spam"                      .";$_","log" if $_=dnsbl '.blackholes.five-ten-sg.com.',0; # just first
+#              store "=spam".";$_"                  if $_=dnsbl '.blackholes.five-ten-sg.com.',0; # just first
                # I don't send viruses but viruses propagate mails of mine
-               store "=spam"                                   if headeris "X-Mailer",'ravmd/8.3.2';
-               store "=spam"                                   if $isFROM_MAILER && headeris("To",'<short@ucw.cz>');
+               store "=spam".";ravmd"               if headeris "X-Mailer",'ravmd/8.3.2';
+               store "=spam".';short@ucw.cz+MAILER' if $isFROM_MAILER && headeris("To",'<short@ucw.cz>');
                };
        $store_profile=undef();