Changeset 598

Timestamp:

03/21/14 16:05:04 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Fine-tune conversion of tinydns "." record entries to SOA+NS records.

File:

• trunk/tiny-import.pl (modified) (1 diff)

trunk/tiny-import.pl

@@ -704 +704 @@
                 undef, ($msg, $loc));
           ($rdns) = $dbh->selectrow_array("SELECT currval('revzones_rdns_id_seq')");
-          ($ttl, $stampactive, $expires, $stamp) = calcstamp($stamp, 2560, 0, 'y');
+          my $soattl;
+          ($soattl, $stampactive, $expires, $stamp) = calcstamp($stamp, 2560, 0, 'y');
 # this would probably make a lot more sense to do hostmaster.$config{admindomain}
 # otherwise, it's as per the tinydns defaults that work tolerably well on a small scale
 # serial -> modtime of data file, ref -> 16384, ret -> 2048, exp -> 1048576, min -> 2560
-          $recsth->execute(0, $rdns, "hostmaster.$fqdn:$ns", 6, "16384:2048:1048576:2560", 0, 0, 0, "2560",
+# the SOA also gets the default 2560 TTL, no matter what was set on the . entry.
+          $recsth->execute(0, $rdns, "hostmaster.$fqdn:$ns", 6, "16384:2048:1048576:2560", 0, 0, 0, $soattl,
                 $loc, $stamp, $expires, $stampactive);
         }
-        ($ttl, $stampactive, $expires, $stamp) = calcstamp($stamp, 2560, $rdns, 'y') if !$stamp;
+        # NS records get the specified TTL from the original . entry
+        ($ttl, $stampactive, $expires, $stamp) = calcstamp($stamp, $ttl, $rdns, 'y') if !$stamp;
         $recsth->execute(0, $rdns, $ns, 2, "$msg", 0, 0, 0, $ttl, $loc, $stamp, $expires, $stampactive);
 ##fixme:  (?)  implement full conversion of tinydns . records?