Changeset 426

Timestamp:

10/11/12 15:15:58 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix up addRec, updateRec, and delRec in dns-rpc.cgi. See #43.

File:

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

trunk/dns-rpc.cgi

@@ -356 +356 @@
   _commoncheck(\%args, 'y');
 
+  # add records in the zone's default location if none is specified
+  if (!$args{location} && $args{defrec} eq 'n') {
+    $args{location} = DNSDB::getZoneLocation($dbh, $args{revrec}, $args{parent_id});
+  }
+
+  my @recargs = ($dbh, $args{defrec}, $args{revrec}, $args{parent_id},
+        \$args{name}, \$args{type}, \$args{address}, $args{ttl}, $args{location});
+  if ($args{type} == $DNSDB::reverse_typemap{MX} or $args{type} == $DNSDB::reverse_typemap{SRV}) {
+    push @recargs, $args{distance};
+    if ($args{type} == $DNSDB::reverse_typemap{SRV}) {
+      push @recargs, $args{weight};
+      push @recargs, $args{port};
+    }
+  }
+
+  my ($code, $msg) = DNSDB::addRec(@recargs);
+
+  die $msg if $code eq 'FAIL';
+  return $msg;
+}
+
+sub updateRec {
+  my %args = @_;
+
+  _commoncheck(\%args, 'y');
+
   # note dist, weight, port are not required on all types;  will be ignored if not needed.
-  my ($code, $msg) = DNSDB::addRec($dbh, $args{def}, $args{domid}, $args{host}, $DNSDB::typemap{$args{type}},
-        $args{val}, $args{ttl}, $args{dist}, $args{weight}, $args{port});
-
-  die $msg if $code eq 'FAIL';
-}
-
-sub updateRec {
-  my %args = @_;
-
-  _commoncheck(\%args, 'y');
-
-  # note dist, weight, port are not required on all types;  will be ignored if not needed.
-  my ($code, $msg) = DNSDB::updateRec($dbh, $args{def}, $args{recid}, $args{host}, $DNSDB::typemap{$args{type}},
-        $args{val}, $args{ttl}, $args{dist}, $args{weight}, $args{port});
-
-  die $msg if $code eq 'FAIL';
+  # parent_id is the "primary" zone we're updating;  necessary for forward/reverse voodoo
+  my ($code, $msg) = DNSDB::updateRec($dbh, $args{defrec}, $args{revrec}, $args{id}, $args{parent_id},
+        \$args{name}, \$args{type}, \$args{address}, $args{ttl}, $args{location},
+        $args{distance}, $args{weight}, $args{port});
+
+  die $msg if $code eq 'FAIL';
+  return $msg;
 }
 
@@ -380 +397 @@
   _commoncheck(\%args, 'y');
 
-  my ($code, $msg) = DNSDB::delRec($dbh, $args{def}, $args{recid});
-
-  die $msg if $code eq 'FAIL';
+  my ($code, $msg) = DNSDB::delRec($dbh, $args{defrec}, $args{recrev}, $args{id});
+
+  die $msg if $code eq 'FAIL';
+  return $msg;
 }