From b3eacea14f7163775914cfcce139192d0b6a82ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ask=20Bj=C3=B8rn=20Hansen?= Date: Fri, 16 May 2008 22:43:17 +0000 Subject: [PATCH] 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 --- plugins/check_earlytalker | 8 ++++---- plugins/require_resolvable_fromhost | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/check_earlytalker b/plugins/check_earlytalker index af585e9..7ac6166 100644 --- a/plugins/check_earlytalker +++ b/plugins/check_earlytalker @@ -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'})) { diff --git a/plugins/require_resolvable_fromhost b/plugins/require_resolvable_fromhost index a762420..7f489e3 100644 --- a/plugins/require_resolvable_fromhost +++ b/plugins/require_resolvable_fromhost @@ -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*//;