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

Merge pull request #245 from msimerson/frank

Browse Source 
badrcpt use reason, and defined-ness test
This commit is contained in:
Matt Simerson 2015-07-20 13:09:22 -07:00
commit 8f4029481a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/badrcptto
View File

@ -66,12 +66,9 @@ sub hook_rcpt {
if ($self->is_match($to, lc($bad), $host)) { if ($self->is_match($to, lc($bad), $host)) {
$self->adjust_karma(-2); $self->adjust_karma(-2);
if ($reason) { if ($reason) {
return DENY, "mail to $bad not accepted here"; return DENY, $reason;
}
else {
return Qpsmtpd::DSN->no_such_user(
"mail to $bad not accepted here");
} }
return Qpsmtpd::DSN->no_such_user("mail to $bad not accepted here");
} }
} }
$self->log(LOGINFO, 'pass'); $self->log(LOGINFO, 'pass');

2
plugins/relay
View File

@ -230,7 +230,7 @@ sub hook_connect {
return DECLINED; return DECLINED;
} }
if ($ENV{RELAYCLIENT}) { if (defined $ENV{RELAYCLIENT}) {
$self->qp->connection->relay_client(1); $self->qp->connection->relay_client(1);
$self->log(LOGINFO, "pass, enabled by env"); $self->log(LOGINFO, "pass, enabled by env");
return DECLINED; return DECLINED;