Changeset 436 for trunk/dns.cgi

Timestamp:

10/30/12 12:18:50 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix bug in AXFR import (couldn't import as inactive)
Extend AXFR import to allow overriding TTLs. Note this is all-or-nothing.

File:

• trunk/dns.cgi (modified) (2 diffs)

trunk/dns.cgi

@@ -1542 +1542 @@
   $page->param(rwsoa => $webvar{rwsoa}) if $webvar{rwsoa};
   $page->param(rwns => $webvar{rwns}) if $webvar{rwns};
+  $page->param(forcettl => $webvar{forcettl}) if $webvar{forcettl};
+  $page->param(newttl => $webvar{newttl}) if $webvar{newttl};
   # This next one is arguably better on by default, but Breaking Things Is Bad, Mmmkay?
   $page->param(mergematching => $webvar{mergematching}) if $webvar{mergematching};
@@ -1569 +1571 @@
       my %row;
       my ($code,$msg) = importAXFR($dbh, $webvar{ifrom}, $domain, $webvar{group},
-        $webvar{zonestatus}, $webvar{rwsoa}, $webvar{rwns}, $webvar{mergematching});
+        $webvar{domactive}, $webvar{rwsoa}, $webvar{rwns}, ($webvar{forcettl} ? $webvar{newttl} : 0),
+        $webvar{mergematching});
       $row{domok} = $msg if $code eq 'OK';
       if ($code eq 'WARN') {