Merge remote branch 'origin'
authorroot <jgh146exb@wizmail.org>
Mon, 16 Apr 2012 20:04:52 +0000 (21:04 +0100)
committerroot <jgh146exb@wizmail.org>
Mon, 16 Apr 2012 20:04:52 +0000 (21:04 +0100)
test/runtest

index 2a8dd160c809117ee965089539a9fdc8a3e25f38..e71ee9fec0932659dff734300b65a8a71157c406 100755 (executable)
@@ -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 /;