Changeset 437 for branches/stable/DNSDB.pm

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)

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";