Index: branches/cname-collision/DNSDB.pm
===================================================================
--- branches/cname-collision/DNSDB.pm	(revision 973)
+++ branches/cname-collision/DNSDB.pm	(revision 974)
@@ -641,5 +641,5 @@
     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,5 +661,5 @@
   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);