make the "this connection is whitelisted note" consistent between all plugins in the distribution
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@908 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
parent
f0a27f8c37
commit
b3eacea14f
@ -104,7 +104,7 @@ sub apr_connect_handler {
|
||||
my ($self, $transaction) = @_;
|
||||
|
||||
return DECLINED unless $self->{_args}{'check-at'}{CONNECT};
|
||||
return DECLINED if ($self->qp->connection->notes('whitelistclient'));
|
||||
return DECLINED if ($self->qp->connection->notes('whitelisthost'));
|
||||
my $ip = $self->qp->connection->remote_ip;
|
||||
|
||||
my $c = $self->qp->{conn};
|
||||
@ -132,7 +132,7 @@ sub apr_data_handler {
|
||||
my ($self, $transaction) = @_;
|
||||
|
||||
return DECLINED unless $self->{_args}{'check-at'}{DATA};
|
||||
return DECLINED if ($self->qp->connection->notes('whitelistclient'));
|
||||
return DECLINED if ($self->qp->connection->notes('whitelisthost'));
|
||||
my $ip = $self->qp->connection->remote_ip;
|
||||
|
||||
my $c = $self->qp->{conn};
|
||||
@ -158,7 +158,7 @@ sub connect_handler {
|
||||
|
||||
return DECLINED unless $self->{_args}{'check-at'}{CONNECT};
|
||||
return DECLINED
|
||||
if ($self->qp->connection->notes('whitelistclient'));
|
||||
if ($self->qp->connection->notes('whitelisthost'));
|
||||
|
||||
$in->add(\*STDIN) || return DECLINED;
|
||||
if ($in->can_read($self->{_args}->{'wait'})) {
|
||||
@ -183,7 +183,7 @@ sub data_handler {
|
||||
|
||||
return DECLINED unless $self->{_args}{'check-at'}{DATA};
|
||||
return DECLINED
|
||||
if ($self->qp->connection->notes('whitelistclient'));
|
||||
if ($self->qp->connection->notes('whitelisthost'));
|
||||
|
||||
$in->add(\*STDIN) || return DECLINED;
|
||||
if ($in->can_read($self->{_args}->{'wait'})) {
|
||||
|
@ -11,7 +11,7 @@ sub hook_mail {
|
||||
my ($self, $transaction, $sender, %param) = @_;
|
||||
|
||||
return DECLINED
|
||||
if ($self->qp->connection->notes('whitelistclient'));
|
||||
if ($self->qp->connection->notes('whitelisthost'));
|
||||
|
||||
foreach my $i ($self->qp->config("invalid_resolvable_fromhost")) {
|
||||
$i =~ s/^\s*//;
|
||||
|
Loading…
Reference in New Issue
Block a user