Changeset 437 for branches/stable

Timestamp:

10/30/12 12:23:30 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Backport AXFR fix/enhancement from /trunk r436. Merged but all
three files conflicted (expected).

Location:

branches/stable

Files:

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

branches/stable/DNSDB.pm

@@ -1744 +1744 @@
   my $domain = 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;
 
 ##fixme:  add mode to delete&replace, merge+overwrite, merge new?
@@ -1801 +1803 @@
     while (my $rr = $res->axfr_next()) {
       my $type = $rr->type;
+      my $ttl = ($newttl ? $newttl : $rr->ttl); # allow force-override TTLs
 
       my $sql = "INSERT INTO records (domain_id,host,type,ttl,val";

branches/stable/dns.cgi

@@ -1462 +1462 @@
   $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};
   $page->param(dominactive => 1) if (!$webvar{domactive} && $webvar{doit});     # eww.
   $page->param(importdoms => $webvar{importdoms}) if $webvar{importdoms};
@@ -1485 +1487 @@
       my %row;
       my ($code,$msg) = importAXFR($dbh, $webvar{ifrom}, $domain, $webvar{group},
-        $webvar{domstatus}, $webvar{rwsoa}, $webvar{rwns});
+        $webvar{domstatus}, $webvar{rwsoa}, $webvar{rwns}, ($webvar{forcettl});
       $row{domok} = $msg if $code eq 'OK';
       if ($code eq 'WARN') {

branches/stable/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">