use postgres inet functions for greylist matching

[pmg-api.git] / src / PMG / Cluster.pm

diff --git a/src/PMG/Cluster.pm b/src/PMG/Cluster.pm
index e8909245ede8a881abe63017ac175a5a10fb0814..f99232da1befccd45c55fe6858f31df441b8fc78 100644 (file)
--- a/src/PMG/Cluster.pm
+++ b/src/PMG/Cluster.pm
@@ -763,12 +763,15 @@ sub sync_greylist_db {
            "mtime >= $lastmt AND CID != 0";
     };
 
-    my $merge_sth = $dbh->prepare($PMG::DBTools::cgreylist_merge_sql);
+    # FIXME: drop Host column with PMG 7.0
+    my $merge_sth = $dbh->prepare(PMG::DBTools::cgreylist_merge_sql());
     my $mergefunc = sub {
        my ($ref) = @_;
 
+       my $ipnet = $ref->{ipnet};
+       $ipnet .= '.0/24' if $ipnet !~ /\/\d+$/;
        $merge_sth->execute(
-           $ref->{ipnet}, $ref->{host}, $ref->{sender}, $ref->{receiver},
+           $ipnet, 0, $ref->{sender}, $ref->{receiver},
            $ref->{instance}, $ref->{rctime}, $ref->{extime}, $ref->{delay},
            $ref->{blocked}, $ref->{passed}, 0, $ref->{cid});
     };