[svn:qpsmtpd] r908 - trunk/plugins

[ask]

Author: ask
Date: Fri May 16 15:43:17 2008
New Revision: 908

Modified:
   trunk/plugins/check_earlytalker
   trunk/plugins/require_resolvable_fromhost

Log:
make the "this connection is whitelisted note" consistent between all plugins 
in the distribution



Modified: trunk/plugins/check_earlytalker
==============================================================================
--- trunk/plugins/check_earlytalker     (original)
+++ trunk/plugins/check_earlytalker     Fri May 16 15:43:17 2008
@@ -104,7 +104,7 @@
     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 @@
     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 @@
 
   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 @@
 
   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'})) {

Modified: trunk/plugins/require_resolvable_fromhost
==============================================================================
--- trunk/plugins/require_resolvable_fromhost   (original)
+++ trunk/plugins/require_resolvable_fromhost   Fri May 16 15:43:17 2008
@@ -11,7 +11,7 @@
   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*//;