Changeset 436 for trunk

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.

Location:

trunk

Files:

• DNSDB.pm (modified) (2 diffs)
• dns.cgi (modified) (2 diffs)
• templates/axfr.tmpl (modified) (1 diff)

trunk/DNSDB.pm

@@ -4158 +4158 @@
   my $zone = shift;
   my $group = shift;
-  my $status = shift || 1;
+  my $status = shift;
+  $status = (defined($status) ? $status : 0);   # force sane semantics, and allow passing "null" (inactive) status
   my $rwsoa = shift || 0;
   my $rwns = shift || 0;
+  my $newttl = shift;
   my $merge = shift || 0;       # do we attempt to merge A/AAAA and PTR records whenever possible?
                                 # do we overload this with the fixme below?
@@ -4316 +4318 @@
       my $type = $rr->type;
       my $host = $rr->name;
-      my $ttl = $rr->ttl;
+      my $ttl = ($newttl ? $newttl : $rr->ttl); # allow force-override TTLs
 
       $soaflag = 1 if $type eq 'SOA';

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') {

trunk/templates/axfr.tmpl

@@ -33 +33 @@
         <td>Rewrite NS to group default?</td>
         <td><input type="checkbox" name="rwns"<TMPL_IF rwns> checked="checked"</TMPL_IF> /></td>
+</tr>
+<tr class="datalinelight">
+        <td>Force all TTLs to new value?</td>
+        <td><input type="checkbox" name="forcettl"<TMPL_IF forcettl> checked="checked"</TMPL_IF> /><input name="newttl" size="7"<TMPL_IF newttl> value="<TMPL_VAR NAME=newttl>"</TMPL_IF> /></td>
 </tr>
 <tr class="datalinelight">