Fix validation of IPv6 addresses

diff --git a/apache/apache-lib.pl b/apache/apache-lib.pl
index de8315c..289ce80 100644 (file)
--- a/apache/apache-lib.pl
+++ b/apache/apache-lib.pl
@@ -1861,5 +1861,11 @@ else {
        }
 }
 
+sub check_apache_ip6address
+{
+local ($ip) = @_;
+return $ip =~ /^\[(\S+)\]$/ && &check_ip6address("$1");
+}
+
 1;
 

diff --git a/apache/create_virt.cgi b/apache/create_virt.cgi
index cf7521d..392503b 100755 (executable)
--- a/apache/create_virt.cgi
+++ b/apache/create_virt.cgi
@@ -32,7 +32,7 @@ else {
        @addrs = split(/\s+/, $in{'addr'});
        foreach $a (@addrs) {
                gethostbyname($a) || &check_ipaddress($a) ||
-                   &check_ip6address($a) ||
+                   &check_apache_ip6address($a) ||
                        &error(&text('cvirt_eaddr2', $a));
                }
        $addr = $in{'addr'};

diff --git a/apache/index.cgi b/apache/index.cgi
index 8981e5d..3369a73 100755 (executable)
--- a/apache/index.cgi
+++ b/apache/index.cgi
@@ -453,7 +453,7 @@ local $addr = $_[0]->{'words'}->[0] =~ /^(\S+):(\S+)/ ? $1 :
                $_[0]->{'words'}->[0];
 return $addr eq '_default_' || $addr eq '*' ? undef :
        &check_ipaddress($addr) ? $addr :
-       &check_ip6address($addr) ? $addr :
+       &check_apache_ip6address($addr) ? $addr :
                                 &to_ipaddress($addr);
 }