Changeset 522

Timestamp:

06/12/13 17:03:30 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Add option to tiny-import to be less strict about importing = records.
-l will import the = record as-is, even if the forward or reverse zone
doesn't exist. Note if the zone is imported or added later this will
*NOT* automatically import the record!

Records that are not in either a forward or reverse zone will still be
treated as "failed".

File:

• trunk/tiny-import.pl (modified) (4 diffs)

trunk/tiny-import.pl

@@ -37 +37 @@
         conv    => 0,
         trial   => 0,
+        legacy  => 0,
         );
 # Handle some command-line arguments
 while ($ARGV[0] =~ /^-/) {
   my $arg = shift @ARGV;
-  usage() if $arg !~ /^-[rct]+$/;
+  usage() if $arg !~ /^-[rclt]+$/;
   # -r  rewrite imported files to comment imported records
   # -c  coerce/downconvert A+PTR = records to PTR
+  # -l  swallow A+PTR as-is
   # -t  trial mode;  don't commit to DB or actually rewrite flatfile (disables -r)
   $arg =~ s/^-//;
@@ -50 +52 @@
     $importcfg{rw} = 1 if $_ eq 'r';
     $importcfg{conv} = 1 if $_ eq 'c';
+    $importcfg{legacy} = 1 if $_ eq 'l';
     $importcfg{trial} = 1 if $_ eq 't';
   }
@@ -65 +68 @@
             Multiple passes may be necessary if SOA and = records are heavily
             intermixed and not clustered together.
+        -l  (for "legacy")  Force import of A+PTR records as-is.  Mutually exclusive
+            with -c.  -l takes precedence as -c is lossy.
         -t  Trial run mode;  spits out records that would be left unimported.
             Disables -r if set.
@@ -272 +277 @@
         $recsth->execute($fparent, $rparent, $host, 65280, $ip, 0, 0, 0, $ttl, $loc);
       } else {
-        if ($importcfg{conv}) {
+        if ($importcfg{legacy}) {
+          # Just import it already!  Record may still be subject to downconversion on editing.
+          $fparent = 0 if !$fparent;
+          $rparent = 0 if !$rparent;
+          if ($fparent || $rparent) {
+            $recsth->execute($fparent, $rparent, $host, 65280, $ip, 0, 0, 0, $ttl, $loc);
+          } else {
+            # No parents found, cowardly refusing to add a dangling record
+            push @deferred, $rec unless $nodefer;
+            $impok = 0;
+          }
+        } elsif ($importcfg{conv}) {
           # downconvert A+PTR if forward zone is not found
           $recsth->execute(0, $rparent, $host, 12, $ip, 0, 0, 0, $ttl, $loc);