Changeset 202

Timestamp:

12/15/11 17:18:17 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix bug in SOA handling; Vega stores "contact:primary-ns" in the
host field, not "primary-ns:contact"... so we do too until we come
up with a completely different and better way to handle SOA records.

Location:

trunk

Files:

• DNSDB.pm (modified) (2 diffs)
• dns.cgi (modified) (1 diff)

trunk/DNSDB.pm

@@ -1229 +1229 @@
 
   my ($recid,$host,$val,$ttl,$serial) = $sth->fetchrow_array() or return;
-  my ($prins,$contact) = split /:/, $host;
+  my ($contact,$prins) = split /:/, $host;
   my ($refresh,$retry,$expire,$minttl) = split /:/, $val;
 
@@ -1932 +1932 @@
         # val is abused to contain refresh:retry:expire:minttl
 ##fixme:  "manual" serial vs tinydns-autoserial
-        print $datafile "Z$host"."::$val:$ttl:$stamp:$loc\n";
+        # let's be explicit about abusing $host and $val
+        my ($email, $primary) = (split /:/, $host)[0,1];
+        my ($refresh, $retry, $expire, $min_ttl) = (split /:/, $val)[0,1,2,3];
+        print $datafile "Z$dom:$primary:$email"."::$refresh:$retry:$expire:$min_ttl:$ttl:$stamp:$loc\n";
 
       } elsif ($typemap{$type} eq 'A') {

trunk/dns.cgi

@@ -744 +744 @@
         " SET host=?, val=?, ttl=? WHERE record_id=?";
   $sth = $dbh->prepare($sql);
-  $sth->execute("$webvar{prins}:$webvar{contact}", 
+  $sth->execute("$webvar{contact}:$webvar{prins}", 
         "$webvar{refresh}:$webvar{retry}:$webvar{expire}:$webvar{minttl}",
         $webvar{ttl},