Changeset 974 for branches/cname-collision/DNSDB.pm

Timestamp:

01/09/26 12:42:23 (8 days ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

Fix SQL logic bug picking out possible colliding records
See #72

File:

• branches/cname-collision/DNSDB.pm (modified) (2 diffs)

branches/cname-collision/DNSDB.pm

@@ -641 +641 @@
     if ($args{defrec} eq 'n') {
       # Expired records
-      $sql .= " AND (stampactive = 't' AND (expires = 't' AND stamp >= now()))";
+      $sql .= " AND (stampactive = 'f' OR (stampactive = 't' AND (expires = 't' AND stamp >= now())))";
     }
     my @lookupargs = ($args{id}, $hcheck);
@@ -661 +661 @@
   if ($args{defrec} eq 'n') {
     # Expired records
-    $sql .= " AND (stampactive = 't' AND (expires = 't' AND stamp >= now()))";
+    $sql .= " AND (stampactive = 'f' OR (stampactive = 't' AND (expires = 't' AND stamp >= now())))";
   }
   my @lookupargs = ($args{id}, $hcheck);