Ignore:
Timestamp:
01/02/14 13:26:38 (10 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Merge forward bugfixes and option additions from /trunk r570 through r581

Location:
branches/stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/stable

  • branches/stable/dns.cgi

    r562 r582  
    275275      # and reconstruct the URI argument list.
    276276      my %target = (page => "domlist");
    277       if ($webvar{target} && $webvar{target} =~ /\?/) {
     277      if ($webvar{target} && $webvar{target} =~ /\?/ && $webvar{target} !~ /page=login/) {
    278278        my $tmp = (split /\?/, $webvar{target})[1];
    279279        $tmp =~ s/^\&//;
     
    20042004
    20052005  foreach my $rec (@$foo2) {
     2006    # NS records.  Need to do this first before we convert the type-value to the text representation
     2007    if ($rev eq 'y' && $dnsdb->{showrec_arpa_ns} && $rec->{type} == $reverse_typemap{NS}) {
     2008      my $tmp = new NetAddr::IP $rec->{val};
     2009      $rec->{val} = DNSDB::_ZONE($tmp, 'ZONE', 'r', '.').($tmp->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
     2010    }
    20062011    $rec->{type} = $typemap{$rec->{type}};
    20072012    $rec->{fwdzone} = $rev eq 'n';
Note: See TracChangeset for help on using the changeset viewer.