From 5dbc47ed1ac23b88079d3b87c25badfc4d7d66ba Mon Sep 17 00:00:00 2001
From: Matt Simerson <matt@tnpi.net>
Date: Sat, 23 Jun 2012 00:45:18 -0400
Subject: [PATCH] hosts_allow: better logging

---
 plugins/hosts_allow | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/plugins/hosts_allow b/plugins/hosts_allow
index 77aafd1..550504c 100644
--- a/plugins/hosts_allow
+++ b/plugins/hosts_allow
@@ -82,24 +82,34 @@ sub hook_pre_connection {
         }
     }
 
-    foreach ($self->qp->config("hosts_allow")) {
-        s/^\s*//;
-        my ($ipmask, $const, $message) = split /\s+/, $_, 3;
-        next unless defined $const;
-
-        my ($net,$mask) = split '/', $ipmask, 2;
-        $mask = 32 if !defined $mask;
-        $mask = pack "B32", "1"x($mask)."0"x(32-$mask);
-        if (join(".", unpack("C4", inet_aton($remote) & $mask)) eq $net) {
-            $const = Qpsmtpd::Constants::return_code($const) || DECLINED;
-            if ( $const =~ /deny/i ) {
-                $self->log( LOGINFO, "fail: $message" );
-            };
-            $self->log( LOGDEBUG, "pass: $const, $message" );
-            return($const, $message);
-        }
-    }
+    my @r = $self->in_hosts_allow( $remote );
+    return @r if scalar @r;
 
     $self->log( LOGDEBUG, "pass" );
     return (DECLINED);
 }
+
+sub in_hosts_allow {
+    my $self = shift;
+    my $remote = shift;
+
+    foreach ( $self->qp->config('hosts_allow') ) {
+        s/^\s*//;    # trim leading whitespace
+        my ($ipmask, $const, $message) = split /\s+/, $_, 3;
+        next unless defined $const;
+
+        my ($net,$mask) = split '/', $ipmask, 2;
+        $mask = 32 if ! defined $mask;
+        $mask = pack "B32", "1"x($mask)."0"x(32-$mask);
+        if (join('.', unpack('C4', inet_aton($remote) & $mask)) eq $net) {
+            $const = Qpsmtpd::Constants::return_code($const) || DECLINED;
+            if ( $const =~ /deny/i ) {
+                $self->log( LOGINFO, "fail, $message" );
+            };
+            $self->log( LOGDEBUG, "pass, $const, $message" );
+            return($const, $message);
+        }
+    }
+
+    return;
+};