Changeset 671 for trunk

Timestamp:

01/15/15 13:42:25 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix caller-facing error reporting a little in dns-rpc.cgi
Add a comment to locate more formal-correctness data cleanup

File:

• trunk/dns-rpc.cgi (modified) (8 diffs)

trunk/dns-rpc.cgi

@@ -211 +211 @@
     $zoneid = $dnsdb->domainID($args{zone}) if $args{revrec} eq 'n';
     $zoneid = $dnsdb->revID($args{zone}) if $args{revrec} eq 'y';
-    die "Can't find zone: $dnsdb->errstr\n" if !$zoneid;
+    die "Can't find zone: ".$dnsdb->errstr."\n" if !$zoneid;
     ($code,$msg) = $dnsdb->delZone($zoneid, $args{revrec});
   }
@@ -227 +227 @@
 
   my $domid = $dnsdb->domainID($args{domain});
-  die "$dnsdb->errstr\n" if !$domid;
+  die $dnsdb->errstr."\n" if !$domid;
   return $domid;
 }
@@ -397 +397 @@
   my $ret = $dnsdb->getRecLine($args{defrec}, $args{revrec}, $args{id});
 
-  die "$dnsdb->errstr\n" if !$ret;
+  die $dnsdb->errstr."\n" if !$ret;
 
   return $ret;
@@ -430 +430 @@
 
   # fail if we *still* don't have a valid zone ID
-  die "$dnsdb->errstr\n" if !$args{id};
+  die $dnsdb->errstr."\n" if !$args{id};
 
   # and finally retrieve the records.
@@ -436 +436 @@
         offset => $args{offset}, nrecs => $args{nrecs}, sortby => $args{sortby},
         sortorder => $args{sortorder}, filter => $args{filter});
-  die "$dnsdb->errstr\n" if !$ret;
+  die $dnsdb->errstr."\n" if !$ret;
 
   return $ret;
@@ -458 +458 @@
         id => $args{id}, filter => $args{filter});
 
-  die "$dnsdb->errstr\n" if !$ret;
+  die $dnsdb->errstr."\n" if !$ret;
 
   return $ret;
@@ -543 +543 @@
       my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y',
         id => $zonelist->[0]->{rdns_id}, filter => $filt);
+##fixme: Figure some new magic to automerge new incoming A(AAA)+PTR requests
+# with existing A records to prevent duplication of A(AAA) records
       if (scalar(@$reclist) == 0) {
         # Aren't Magic Numbers Fun?  See pseudotype list in dnsadmin.
@@ -667 +669 @@
           } else {
             my $ret = $dnsdb->downconvert($rec->{record_id}, $DNSDB::reverse_typemap{A});
-            die "$dnsdb->errstr\n" if !$ret;
+            die $dnsdb->errstr."\n" if !$ret;
             return "A+PTR for $args{cidr} split and PTR removed";
           }