From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Thu, 26 Sep 2019 21:36:38 +0000 (+0100)
Subject: Testsuite: disallow :: as a usable ipv6 address
X-Git-Tag: exim-4.93-RC0~44
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=8af2888bc8f9a896bbf754ac47e3eba86fd87eac;p=user%2Fhenk%2Fcode%2Fexim.git

Testsuite: disallow :: as a usable ipv6 address
---

diff --git a/test/runtest b/test/runtest
index ec9c72cd1..45ee6e208 100755
--- a/test/runtest
+++ b/test/runtest
@@ -3410,14 +3410,13 @@ while (not ($parm_ipv4 and $parm_ipv6) and defined($_ = <IFCONFIG>))
     # It would ne nice to be able to vary the /16 used for manyhome; we could take
     # an option to runtest used here - but we'd also have to pass it on to fakens.
     # Possibly an environment variable?
-    next if $1 =~ /^(?:127|10\.250)\./;
-    next if $1 eq '0.0.0.0';
+    next if $1 eq '0.0.0.0' or $1 =~ /^(?:127|10\.250)\./;
     $parm_ipv4 = $1;
     }
 
   if (not $parm_ipv6 and /^\s*inet6(?:\saddr)?:?\s?([abcdef\d:]+)(?:%[^ \/]+)?(?:\/\d+)?/i)
     {
-    next if $1 eq '::1' or $1 =~ /^fe80/i;
+    next if $1 eq '::' or $1 eq '::1' or $1 =~ /^fe80/i;
     $parm_ipv6 = $1;
     }
   }