Changeset 251

Timestamp:

02/29/12 14:01:20 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix buglet adding default AAAA+PTR records same as was fixed
for A+PTR in r249.
See #26

File:

• trunk/DNSDB.pm (modified) (2 diffs)

trunk/DNSDB.pm

@@ -350 +350 @@
       } elsif (${$args{val}} =~ /[a-f:]/) {
         # looks like a v6 or fragment
-        ${$args{val}} =~ s/^:*/ZONE::/ if !$args{addr};
+        ${$args{val}} =~ s/^:*/ZONE::/ if !$args{addr} && ${$args{val}} !~ /^ZONE/;
         if ($args{addr}) {
           if ($args{addr}->addr =~ /^0/) {
-            ${$args{val}} =~ s/^:*/ZONE::/;
+            ${$args{val}} =~ s/^:*/ZONE::/ unless ${$args{val}} =~ /^ZONE/;
           } else {
             ${$args{val}} = $args{addr}->addr;
@@ -361 +361 @@
         # bare number (probably).  These could be v4 or v6, so we'll
         # expand on these on creation of a reverse zone.
-        ${$args{val}} = "ZONE,${$args{val}}";
+        ${$args{val}} = "ZONE,${$args{val}}" unless ${$args{val}} =~ /^ZONE/;
       }
       ${$args{host}} =~ s/\.*$/\.$config{domain}/ if ${$args{host}} !~ /(?:$config{domain}|ADMINDOMAIN)$/;