git://git.exim.org
/
users
/
jgh
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3c4796b
)
Testsuite: disallow :: as a usable ipv6 address
author
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 26 Sep 2019 21:36:38 +0000
(22:36 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 26 Sep 2019 21:36:38 +0000
(22:36 +0100)
test/runtest
patch
|
blob
|
history
diff --git
a/test/runtest
b/test/runtest
index ec9c72cd108dc24e38d5d3ae48e5c8ed51555781..45ee6e208b173bd609893a89f555add5d9aaadd2 100755
(executable)
--- 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?
# 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)
{
$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;
}
}
$parm_ipv6 = $1;
}
}