Subject: [SACVS] CVS: spamassassin/spamproxy spamproxyd.raw,1.5,1.6 - msg#00122

Update of /cvsroot/spamassassin/spamassassin/spamproxy
In directory usw-pr-cvs1:/tmp/cvs-serv28286

Modified Files:
spamproxyd.raw
Log Message:
Bugzilla #261: my bug and added Syslogging

Index: spamproxyd.raw
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/spamproxy/spamproxyd.raw,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** spamproxyd.raw 6 Apr 2002 18:47:42 -0000 1.5
--- spamproxyd.raw 29 Apr 2002 14:54:28 -0000 1.6
***************
*** 29,32 ****
--- 29,34 ----
# --Ian R. Justman <ianj@xxxxxxxxx>, 11/21/2001

+ use Sys::Syslog qw(:DEFAULT setlogsock);
+
use Carp;
use Net::SMTP::Server;
***************
*** 65,72 ****
my ($srcaddr, $srcport) = split /:/, $ARGV[0];
my ($dstaddr, $dstport) = split /:/, $ARGV[1];
if(@ARGV == 3) {
! my $spamaddr = $ARGV[2];
} else {
! my $spamaddr = "recipient";
}

--- 67,75 ----
my ($srcaddr, $srcport) = split /:/, $ARGV[0];
my ($dstaddr, $dstport) = split /:/, $ARGV[1];
+ my $spamaddr;
if(@ARGV == 3) {
! $spamaddr = $ARGV[2];
} else {
! $spamaddr = "recipient";
}

***************
*** 167,170 ****
--- 170,174 ----
my $status = $spamtest->check($mail);
if ($status->is_spam ()) {
+ $msg = sprintf(" SPAM[%6.1f]: %s", $status->get_hits(),
$status->get_names_of_tests_hit());
$status->rewrite_mail ();
$message = join ("",$mail->header(),@{$mail->body()});
***************
*** 176,181 ****
--- 180,191 ----
}
} else {
+ $msg = sprintf("NOT_SPAM[%6.1f]: %s", $status->get_hits(),
$status->get_names_of_tests_hit());
$recips = $client->{TO};
}
+
+ setlogsock 'unix';
+ openlog('spamassassin', 'nowait', 'local3');
+ syslog('notice', $msg);
+ closelog();

$status->finish();