Changeset 565

Timestamp:

12/19/13 16:27:22 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Edge case bug; databases upgraded from 1.0 to 1.2 schema will be missing
default reverse records. Fix the key bug of missing the SOA record by
adding one if it's missing on whatever entity one is editing. Other records
can be added as usual.

File:

• trunk/DNSDB.pm (modified) (2 diffs)

trunk/DNSDB.pm

@@ -3498 +3498 @@
 
   eval {
-    my $sql = "UPDATE "._rectable($defrec, $revrec)." SET host=?, val=?, ttl=? WHERE record_id=? AND type=6";
-    $dbh->do($sql, undef, ("$soa{contact}:$soa{prins}", "$soa{refresh}:$soa{retry}:$soa{expire}:$soa{minttl}",
+    if (!$oldsoa) {
+      # old SOA record is missing for some reason.  create a new one.
+      my $sql = "INSERT INTO "._rectable($defrec, $revrec)." (group_id, host, type, val, ttl) VALUES (?,?,6,?,?)";
+      $dbh->do($sql, undef, ($soa{id}, "$soa{contact}:$soa{prins}",
+        "$soa{refresh}:$soa{retry}:$soa{expire}:$soa{minttl}", $soa{ttl}) );
+      $msg = ($defrec eq 'y' ? ($revrec eq 'y' ? 'Default reverse ' : 'Default ') : '').
+        "SOA missing for $parname;  added (ns $soa{prins}, contact $soa{contact}, refresh $soa{refresh},".
+        " retry $soa{retry}, expire $soa{expire}, minTTL $soa{minttl}, TTL $soa{ttl})";
+    } else {
+      my $sql = "UPDATE "._rectable($defrec, $revrec)." SET host=?, val=?, ttl=? WHERE record_id=? AND type=6";
+      $dbh->do($sql, undef, ("$soa{contact}:$soa{prins}", "$soa{refresh}:$soa{retry}:$soa{expire}:$soa{minttl}",
         $soa{ttl}, $oldsoa->{record_id}) );
-    $msg = "Updated ".($defrec eq 'y' ? ($revrec eq 'y' ? 'default reverse ' : 'default ') : '').
+      $msg = "Updated ".($defrec eq 'y' ? ($revrec eq 'y' ? 'default reverse ' : 'default ') : '').
         "SOA for $parname: ".
         "(ns $oldsoa->{prins}, contact $oldsoa->{contact}, refresh $oldsoa->{refresh},".
@@ -3507 +3516 @@
         "(ns $soa{prins}, contact $soa{contact}, refresh $soa{refresh},".
         " retry $soa{retry}, expire $soa{expire}, minTTL $soa{minttl}, TTL $soa{ttl})";
-
+    }
     $logdata{entry} = $msg;
     $self->_log(%logdata);