Index: /branches/cname-collision/DNSDB.pm
===================================================================
--- /branches/cname-collision/DNSDB.pm	(revision 969)
+++ /branches/cname-collision/DNSDB.pm	(revision 970)
@@ -640,9 +640,6 @@
 	" WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type <> 5 AND $hfield = ?";
     if ($args{defrec} eq 'n') {
-      $sql .= " AND (";
       # Expired records
-      $sql .= "stampactive = 't' AND (expires = 't' AND stamp >= now())";
-
-      $sql .= ")";
+      $sql .= " AND (stampactive = 't' AND (expires = 't' AND stamp >= now()))";
     }
     my @lookupargs = ($args{id}, $hcheck);
@@ -662,4 +659,8 @@
   my $sql = "SELECT count(*) FROM "._rectable($args{defrec}, $args{revrec}).
 	" WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type = 5 AND $hfield = ?";
+  if ($args{defrec} eq 'n') {
+    # Expired records
+    $sql .= " AND (stampactive = 't' AND (expires = 't' AND stamp >= now()))";
+  }
   my @lookupargs = ($args{id}, $hcheck);
   if ($args{update}) {