byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename check_badmailfrom -> badmailfrom

Browse Source
This commit is contained in:
Matt Simerson 2012-06-22 20:07:29 -04:00
parent 644709e6ae
commit c44f034a76
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
plugins/check_badmailfrom → plugins/badmailfrom
View File

12
plugins/check_badmailfromto → plugins/badmailfromto
View File

@ -34,7 +34,7 @@ sub hook_mail {
next unless $bad; next unless $bad;
$bad = lc $bad; $bad = lc $bad;
if ( $bad !~ m/\@/ ) { if ( $bad !~ m/\@/ ) {
$self->log(LOGWARN, 'badmailfromto: bad config, no @ sign in '. $bad); $self->log(LOGWARN, 'bad config, no @ sign in '. $bad);
next; next;
}; };
if ( $bad eq $from || (substr($bad,0,1) eq '@' && $bad eq "\@$host") ) { if ( $bad eq $from || (substr($bad,0,1) eq '@' && $bad eq "\@$host") ) {
@ -48,7 +48,7 @@ sub hook_rcpt {
my ($self, $transaction, $rcpt, %param) = @_; my ($self, $transaction, $rcpt, %param) = @_;
my $recipient = lc($rcpt->user) . '@' . lc($rcpt->host); my $recipient = lc($rcpt->user) . '@' . lc($rcpt->host);
my $sender = $transaction->notes('badmailfromto') or do { my $sender = $transaction->notes('badmailfromto') or do {
$self->log(LOGDEBUG, "pass: sender not listed"); $self->log(LOGDEBUG, "pass, sender not listed");
return (DECLINED); return (DECLINED);
}; };
@ -57,7 +57,7 @@ sub hook_rcpt {
return (DENY, "mail to $recipient not accepted here") return (DENY, "mail to $recipient not accepted here")
if lc($from) eq $sender && lc($to) eq $recipient; if lc($from) eq $sender && lc($to) eq $recipient;
} }
$self->log(LOGDEBUG, "pass: recipient not listed"); $self->log(LOGDEBUG, "pass, recipient not listed");
return (DECLINED); return (DECLINED);
} }
@ -65,17 +65,17 @@ sub is_sender_immune {
my ($self, $sender, $badmf ) = @_; my ($self, $sender, $badmf ) = @_;
if ( ! scalar @$badmf ) { if ( ! scalar @$badmf ) {
$self->log(LOGDEBUG, 'skip: empty list'); $self->log(LOGDEBUG, 'skip, empty list');
return 1; return 1;
}; };
if ( ! $sender || $sender->format eq '<>' ) { if ( ! $sender || $sender->format eq '<>' ) {
$self->log(LOGDEBUG, 'skip: null sender'); $self->log(LOGDEBUG, 'skip, null sender');
return 1; return 1;
}; };
if ( ! $sender->host || ! $sender->user ) { if ( ! $sender->host || ! $sender->user ) {
$self->log(LOGDEBUG, 'skip: missing user or host'); $self->log(LOGDEBUG, 'skip, missing user or host');
return 1; return 1;
}; };

0
t/plugin_tests/check_badmailfrom → t/plugin_tests/badmailfrom
View File