Allow underscore characters in FQDNs and pointers.

[valtz.git] / valtz

diff --git a/valtz b/valtz
index e9b831f18336ce227fe3ad0c09bc7e96d88f6371..eebda76f4b17beb77fce88c1d3b4f5ecb282428f 100644 (file)
--- a/valtz
+++ b/valtz
@@ -75,7 +75,7 @@ my %validation_msg = (
     1007 => 'parts must not end with the - character',
     1008 => 'integer out of bounds',
     1009 => 'must have at least three labels to be valid as mail address',
-    1010 => 'must not 2(NS), 5(CNAME), 6(SOA), 12(PTR), 15(MX) or 252(AXFR)',
+    1010 => 'must not be 2(NS), 5(CNAME), 6(SOA), 12(PTR), 15(MX) or 252(AXFR)',
 );
 
 # NOTE : ONLY translate the right-hand part
@@ -202,7 +202,7 @@ my %token_validator = (
         # check all parts
         for my $hostpart (split /\./, $s)
         {
-            return 1005 unless $hostpart =~ /^[-a-z0-9]+$/i;
+            return 1005 unless $hostpart =~ /^_?[-a-z0-9]+$/i;
             return 1006 if $hostpart =~ /^-/;
             return 1007 if $hostpart =~ /-$/;
         }
@@ -268,7 +268,7 @@ my %token_validator = (
         # check all parts
         for (split /\./, $s)
         {
-            return 1005 unless /^[-[a-z0-9]+$/i;
+            return 1005 unless /^_?[-[a-z0-9]+$/i;
             return 1006 if /^-/;
             return 1007 if /-$/;
         }
@@ -331,7 +331,7 @@ my %token_validator = (
         my ($type, $s) = @_;
         my $result = validate_integer($s, 65535);
     
-        return 1010 if ($s==2)||($s==5)||($s==6)||($s==12)||($s==15)||($s=252);
+        return 1010 if ($s==2)||($s==5)||($s==6)||($s==12)||($s==15)||($s==252);
 
         return $result;
     }],