Changeset 959

Timestamp:

12/30/25 16:51:56 (4 hours ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

Extend _cname_collision() lookups to skip the record passed in for update,
so as to not fail the checks by finding that record itself.
See #72.

File:

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

branches/cname-collision/DNSDB.pm

@@ -637 +637 @@
   if (${$args{rectype}} == 5) {
     # First, check for non-CNAME collisions.
-    my @t = $dbh->selectrow_array("SELECT count(*) FROM "._rectable($args{defrec}, $args{revrec}).
-        " WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type <> 5 AND $hfield = ?",
-        undef, $args{id}, $hcheck);
+    my $sql = "SELECT count(*) FROM "._rectable($args{defrec}, $args{revrec}).
+        " WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type <> 5 AND $hfield = ?";
+    my @lookupargs = ($args{id}, $hcheck);
+    if ($args{update}) {
+      $sql .= " AND record_id <> ?";
+      push @lookupargs, $args{update};
+    }
+    my @t = $dbh->selectrow_array($sql, undef, @lookupargs);
     if ($t[0] > 0) {
       $errstr = "One or more non-CNAME records already exist for ".($args{revrec} eq 'y' ? $arpaname : $hcheck).
@@ -648 +653 @@
 
   # Second, check for multiple CNAMEs
-  my @t = $dbh->selectrow_array("SELECT count(*) FROM "._rectable($args{defrec}, $args{revrec}).
-        " WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type = 5 AND $hfield = ?",
-        undef, $args{id}, $hcheck);
+  my $sql = "SELECT count(*) FROM "._rectable($args{defrec}, $args{revrec}).
+        " WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type = 5 AND $hfield = ?";
+  my @lookupargs = ($args{id}, $hcheck);
+  if ($args{update}) {
+    $sql .= " AND record_id <> ?";
+    push @lookupargs, $args{update};
+  }
+  my @t = $dbh->selectrow_array($sql, undef, @lookupargs);
   if ($t[0] > 0) {
     $errstr = "There is already a CNAME present for ".($args{revrec} eq 'y' ? $arpaname : $hcheck).