Changeset 590 for trunk/cgi-bin

Timestamp:

01/22/13 17:31:53 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

RPC integration for allocation-delete should be complete. See #1.
Requires dnsadmin:/trunk@r459 or newer.

• Pass a couple more bits into deleteBlock()
• Use the new values when making the RPC call
• Rearrange the delete-confirm page a little to allow the new "delete forward DNS too?" checkbox to actually contribute
• Tweak new-allocation RPC call a little; don't bother if no rDNS was passed in.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (5 diffs)
• main.cgi (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -1032 +1032 @@
     } # end fullcidr != alloc_from
 
-    # now we do the DNS dance for netblocks, if we have an RPC server to do it with.
-    _rpc('addOrUpdateRevRec', cidr => "$args{cidr}", name => $args{rdns}, rpcuser => $args{user});
+    # now we do the DNS dance for netblocks, if we have an RPC server to do it with and a pattern to use.
+    _rpc('addOrUpdateRevRec', cidr => "$args{cidr}", name => $args{rdns}, rpcuser => $args{user})
+      if $args{rdns};
 
     return ('OK', 'OK');
@@ -1184 +1185 @@
 # Also handles "deleting" a static IP allocation, and removal of a master
 # Requires a database handle, the block to delete, the routing depth (if applicable),
-# and the VRF ID
+# the VRF ID, and a flag to indicate whether to delete associated forward DNS entries
+# as well as the reverse entry
 sub deleteBlock {
-  my ($dbh,undef,$rdepth,$vrf) = @_;
+  my ($dbh,undef,$rdepth,$vrf,$delfwd,$user) = @_;
   my $cidr = new NetAddr::IP $_[1];
 
@@ -1240 +1242 @@
       return ('FAIL',$msg);
     } else {
+##fixme:  RPC return code?
+      _rpc('delByCIDR', cidr => "$cidr", user => $user, delforward => $delfwd);
       return ('OK',"OK");
     }
@@ -1258 +1262 @@
       return ('FAIL', $msg);
     } else {
+##fixme:  RPC return code?
+      _rpc('delZone', zone => "$cidr", user => $user, revrec => 'y');
       return ('OK',"OK");
     }
@@ -1428 +1434 @@
       return ('FAIL', $msg);
     } else {
+##fixme:  RPC return code?
+      _rpc('delByCIDR', cidr => "$cidr", user => $user, delforward => $delfwd, delsubs => 'y');
       return ($retcode, $goback);
     }

trunk/cgi-bin/main.cgi

@@ -890 +890 @@
   my $blockinfo = getBlockData($ip_dbh, $webvar{block}, $webvar{rdepth});
 
-  my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{rdepth}, $webvar{vrf});
+  my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{rdepth}, $webvar{vrf}, $webvar{delforward}, $authuser);
 
   $page->param(block => $webvar{block});