Changeset 758 for trunk/cgi-bin

Timestamp:

07/28/15 17:56:02 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Refine calls to getBlockData() in allocateBlock() and updateBlock() for
proper sourcing and handling of rDNS-is-available flags. See #1, #41.

File:

• trunk/cgi-bin/IPDB.pm (modified) (3 diffs)

trunk/cgi-bin/IPDB.pm

@@ -1451 +1451 @@
     } else {
       # Snag the pool info
-      my $pinfo = getBlockData($args{parent});
+      my $pinfo = getBlockData($dbh, $args{parent});
       # Only try to update rDNS when the pool is flagged as "rDNS available"
-      if ($binfo->{revavail} || $binfo->{revpartial}) {
+      if ($pinfo->{revavail} || $pinfo->{revpartial}) {
         _rpc('addOrUpdateRevRec', cidr => "$args{cidr}", name => $args{rdns}, rpcuser => $args{user});
       }
@@ -1596 +1596 @@
 
     # Snag the parent info
-    my $pinfo = getBlockData($fbparent);
+    my $pinfo = getBlockData($dbh, $fbparent);
     # Only try to update rDNS when the pool is flagged as "rDNS available"
-    if ($binfo->{revavail} || $binfo->{revpartial}) {
+    if ($pinfo->{revavail} || $pinfo->{revpartial}) {
       # 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})
@@ -1810 +1810 @@
   # Do RPC rDNS call, if available.
   # Snag the parent info
-  my $pinfo = getBlockData($args{parent});
+  my $pinfo = getBlockData($dbh, $binfo->{parent_id});
   # Return early if rDNS flag(s) are not set
   return ('OK','OK') unless ($pinfo->{revavail} || $pinfo->{revpartial});