From: root Date: Mon, 2 Apr 2012 19:57:49 +0000 (+0100) Subject: Fix IPv6 RE X-Git-Tag: exim-4_80_RC1~71 X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/48dc547000f0d1fa0bfea4040ee6ae71b530ef63?hp=3b4f55a3467f3c0dc52711f14fb3a593daa93f36 Fix IPv6 RE --- diff --git a/test/runtest b/test/runtest index 2a8dd160c..e71ee9fec 100755 --- a/test/runtest +++ b/test/runtest @@ -560,9 +560,9 @@ RESET_AFTER_EXTRA_LINE_READ: s/host\s\Q$parm_ipv4\E\s\[\Q$parm_ipv4\E\]/host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]/; s/host\s\Q$parm_ipv6\E\s\[\Q$parm_ipv6\E\]/host ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]/; s/\b\Q$parm_ipv4\E\b/ip4.ip4.ip4.ip4/g; - s/\b\Q$parm_ipv6\E\b/ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6/g; + s/(^|\W)\K\Q$parm_ipv6\E/ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6/g; s/\b\Q$parm_ipv4r\E\b/ip4-reverse/g; - s/\b\Q$parm_ipv6r\E\b/ip6-reverse/g; + s/(^|\W)\K\Q$parm_ipv6r\E/ip6-reverse/g; s/^(\s+host\s\S+\s+\[\S+\]) +$/$1 /;