Changeset 438 for branches


Ignore:
Timestamp:
10/30/12 12:34:14 (12 years ago)
Author:
Kris Deugau
Message:

/branches/stable

*sigh* Another fine brown-paper-bag commit.

  • $webvar{forcettl}/{newttl} passing truncated due to not watching what needed to be trimmed from the merge
  • TTL override needed to reach the actual insert processing; this was already reworked on /trunk due to other changes

And just for good measure, bump the patch version for release.

Location:
branches/stable
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/DNSDB.pm

    r437 r438  
    3232use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
    3333
    34 $VERSION        = "1.0.4";      ##VERSION##
     34$VERSION        = "1.0.5";      ##VERSION##
    3535@ISA            = qw(Exporter);
    3636@EXPORT_OK      = qw(
    … …  
    18111811      $nsflag = 1 if $type eq 'NS';
    18121812
    1813       my @vallist = ($dom_id, $rr->name, $reverse_typemap{$type}, $rr->ttl);
     1813      my @vallist = ($dom_id, $rr->name, $reverse_typemap{$type}, $ttl);
    18141814
    18151815# "Primary" types:

  • branches/stable/Makefile

    r434 r438  
    33
    44PKGNAME=dnsadmin
    5 VERSION=1.0.4
     5VERSION=1.0.5
    66RELEASE=1
    77

  • branches/stable/dns.cgi

    r437 r438  
    14871487      my %row;
    14881488      my ($code,$msg) = importAXFR($dbh, $webvar{ifrom}, $domain, $webvar{group},
    1489         $webvar{domstatus}, $webvar{rwsoa}, $webvar{rwns}, ($webvar{forcettl});
     1489        $webvar{domstatus}, $webvar{rwsoa}, $webvar{rwns}, ($webvar{forcettl} ? $webvar{newttl} : 0) );
    14901490      $row{domok} = $msg if $code eq 'OK';
    14911491      if ($code eq 'WARN') {
Note: See TracChangeset for help on using the changeset viewer.