postfix-policyd-spf-perl/trunk/postfix-policyd-spf

* Version 1.07.
This commit is contained in:
Julian Mehnle 2006-06-17 16:46:46 +00:00
commit 0bd77bdc15

View file

@ -2,8 +2,8 @@
# postfix-policyd-spf # postfix-policyd-spf
# http://www.openspf.org # http://www.openspf.org
# version 1.06 # version 1.07
# $Id$ # $Id: postfix-policyd-spf 147 2006-03-14 21:51:58Z julian $
use Fcntl; use Fcntl;
use Sys::Syslog qw(:DEFAULT setlogsock); use Sys::Syslog qw(:DEFAULT setlogsock);
@ -121,7 +121,7 @@ my $syslog_ident = "postfix/policy-spf";
# #
sub fatal_exit { sub fatal_exit {
syslog(err => "fatal_exit: @_"); syslog(err => "fatal_exit: @_");
syslog(warn => "fatal_exit: @_"); syslog(warning => "fatal_exit: @_");
syslog(info => "fatal_exit: @_"); syslog(info => "fatal_exit: @_");
die "fatal: @_"; die "fatal: @_";
} }
@ -149,7 +149,7 @@ my %attr;
while (<STDIN>) { while (<STDIN>) {
chomp; chomp;
if (/=/) { my ($k, $v) = split (/=/, $_, 2); $attr{$k} = $v; next } if (/=/) { my ($k, $v) = split (/=/, $_, 2); $attr{$k} = $v; next }
elsif (length) { syslog(warn=>sprintf("warning: ignoring garbage: %.100s", $_)); next; } elsif (length) { syslog(warning => sprintf("warning: ignoring garbage: %.100s", $_)); next; }
if ($VERBOSE) { if ($VERBOSE) {
for (sort keys %attr) { for (sort keys %attr) {
@ -214,8 +214,7 @@ sub testing {
and and
$attr{recipient} =~ /policyblock/) { $attr{recipient} =~ /policyblock/) {
syslog(info=>"%s: testing: will block as requested", syslog(info => "%s: testing: will block as requested", $attr{queue_id});
$attr{queue_id});
return "REJECT smtpd-policy blocking $attr{recipient}"; return "REJECT smtpd-policy blocking $attr{recipient}";
} }
else { else {