git://git.exim.org
/
users
/
heiko
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3b4f55a
)
Fix IPv6 RE
author
root
<jgh146exb@wizmail.org>
Mon, 2 Apr 2012 19:57:49 +0000
(20:57 +0100)
committer
root
<jgh146exb@wizmail.org>
Mon, 2 Apr 2012 19:57:49 +0000
(20:57 +0100)
test/runtest
patch
|
blob
|
history
diff --git
a/test/runtest
b/test/runtest
index 2a8dd160c809117ee965089539a9fdc8a3e25f38..e71ee9fec0932659dff734300b65a8a71157c406 100755
(executable)
--- 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/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_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 /;
s/^(\s+host\s\S+\s+\[\S+\]) +$/$1 /;