Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/stable

    • Property svn:mergeinfo changed
      /trunkmerged: 436
  • branches/stable/dns.cgi

    r432 r437  
    14621462  $page->param(rwsoa => $webvar{rwsoa}) if $webvar{rwsoa};
    14631463  $page->param(rwns => $webvar{rwns}) if $webvar{rwns};
     1464  $page->param(forcettl => $webvar{forcettl}) if $webvar{forcettl};
     1465  $page->param(newttl => $webvar{newttl}) if $webvar{newttl};
    14641466  $page->param(dominactive => 1) if (!$webvar{domactive} && $webvar{doit});     # eww.
    14651467  $page->param(importdoms => $webvar{importdoms}) if $webvar{importdoms};
     
    14851487      my %row;
    14861488      my ($code,$msg) = importAXFR($dbh, $webvar{ifrom}, $domain, $webvar{group},
    1487         $webvar{domstatus}, $webvar{rwsoa}, $webvar{rwns});
     1489        $webvar{domstatus}, $webvar{rwsoa}, $webvar{rwns}, ($webvar{forcettl});
    14881490      $row{domok} = $msg if $code eq 'OK';
    14891491      if ($code eq 'WARN') {
Note: See TracChangeset for help on using the changeset viewer.