Testsuite: Munge the output to fit the ad=… lines

diff --git a/test/runtest b/test/runtest
index 62ab01bac112e8972e096bf299682c51a2d845f0..70f1d9b4b6eaacf7cf95edd74c9e160c3b148d6d 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -676,6 +676,7 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/^\s+host\s(\S+)\s+(\S+)/  host $1 $2/;
   s/^\s+(host\s\S+\s\S+)\s+(port=.*)/  host $1 $2/;
   s/^\s+(host\s\S+\s\S+)\s+(?=MX=)/  $1 /;
   s/^\s+host\s(\S+)\s+(\S+)/  host $1 $2/;
   s/^\s+(host\s\S+\s\S+)\s+(port=.*)/  host $1 $2/;
   s/^\s+(host\s\S+\s\S+)\s+(?=MX=)/  $1 /;

+  s/^\s+host\s.*?\K\s+(ad=\S+)/ $1/;

   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;

diff --git a/test/stdout/0047 b/test/stdout/0047
index 5d5fb5431f02fbcef2b3f1d8aeffbb7df28abae7..c3ba3992fc3364fbd178105d61d19499067f29b8 100644 (file)
--- a/test/stdout/0047
+++ b/test/stdout/0047
@@ -1,9 +1,9 @@
 xx@domain1
   router = domainlist, transport = smtp
 xx@domain1
   router = domainlist, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 xx@route1.ex
   router = domainlist, transport = smtp
 xx@route1.ex
   router = domainlist, transport = smtp

-  host ten-2.test.ex [V4NET.0.0.2]  ad=no
+  host ten-2.test.ex [V4NET.0.0.2] ad=no

 xx@domain3
   router = domainlist, transport = smtp
 xx@domain3
   router = domainlist, transport = smtp

-  host ten-3.test.ex [V4NET.0.0.3]  ad=no
+  host ten-3.test.ex [V4NET.0.0.3] ad=no

diff --git a/test/stdout/0054 b/test/stdout/0054
index e65ab29d48934eedd2ee64aba7eb0978433b3edc..14ad207f2a616a37f24617a4e1bdbfdaca4dc520 100644 (file)
--- a/test/stdout/0054
+++ b/test/stdout/0054
@@ -1,4 +1,4 @@
 xxx@ten-1.test.ex
   router = lookuphost, transport = smtp
 xxx@ten-1.test.ex
   router = lookuphost, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 xxx@ten-2.test.ex is undeliverable: Unrouteable address
 xxx@ten-2.test.ex is undeliverable: Unrouteable address

diff --git a/test/stdout/0078 b/test/stdout/0078
index 45f3678f6c7c0760da0764fc07dc44fc7269144e..90987c27c39162bc1496d71cfd9daa429ed130ab 100644 (file)
--- a/test/stdout/0078
+++ b/test/stdout/0078
@@ -3,8 +3,8 @@ xx@mxt6.test.ex
   host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no
 myhost.test.ex@mxt1.test.ex
   router = self, transport = remote_smtp
   host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no
 myhost.test.ex@mxt1.test.ex
   router = self, transport = remote_smtp

-  host myhost.test.ex [V4NET.10.10.10]  ad=no
+  host myhost.test.ex [V4NET.10.10.10] ad=no

 xx@mxt1.test.ex
   router = self2, transport = remote_smtp
 xx@mxt1.test.ex
   router = self2, transport = remote_smtp

-  host myhost.test.ex [V4NET.10.10.10]  ad=no
+  host myhost.test.ex [V4NET.10.10.10] ad=no

 xx@not.exist is undeliverable: Unrouteable address
 xx@not.exist is undeliverable: Unrouteable address

diff --git a/test/stdout/0089 b/test/stdout/0089
index a075e1cd506b3fcd052ba87c98954ac9d0d6af55..6355d957fafbd3d02eff219ba26edb2099f44769 100644 (file)
--- a/test/stdout/0089
+++ b/test/stdout/0089
@@ -36,5 +36,5 @@ ABCD@test.ex
   router = select, transport = dummy
 XYZ@ten-1.test.ex
   router = manual, transport = dummy
   router = select, transport = dummy
 XYZ@ten-1.test.ex
   router = manual, transport = dummy

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 xyz@ten-1.test.ex is undeliverable: unrouteable mail domain "ten-1.test.ex"
 xyz@ten-1.test.ex is undeliverable: unrouteable mail domain "ten-1.test.ex"

diff --git a/test/stdout/0161 b/test/stdout/0161
index a7f7eca3d20893d68bdd5835afc2155850776d30..cf19af249b236856081e4df3284416aaf2699657 100644 (file)
--- a/test/stdout/0161
+++ b/test/stdout/0161
@@ -3,10 +3,10 @@ xx@mxt6.test.ex
   host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no
 myhost.test.ex@mxt1.test.ex
   router = self, transport = remote_smtp
   host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no
 myhost.test.ex@mxt1.test.ex
   router = self, transport = remote_smtp

-  host myhost.test.ex [V4NET.10.10.10]  ad=no
+  host myhost.test.ex [V4NET.10.10.10] ad=no

 xx@mxt1.test.ex
   router = self2, transport = remote_smtp
 xx@mxt1.test.ex
   router = self2, transport = remote_smtp

-  host myhost.test.ex [V4NET.10.10.10]  ad=no
+  host myhost.test.ex [V4NET.10.10.10] ad=no

 xx@not.exist is undeliverable: Unrouteable address
 ff@mxt1.test.ex is undeliverable: lowest numbered MX record points to local host
 fff@mxt1.test.ex is undeliverable: lookup of host "fff" failed in fail router
 xx@not.exist is undeliverable: Unrouteable address
 ff@mxt1.test.ex is undeliverable: lowest numbered MX record points to local host
 fff@mxt1.test.ex is undeliverable: lookup of host "fff" failed in fail router

diff --git a/test/stdout/0183 b/test/stdout/0183
index 888e7a3c1946964e16c712351386eb8fa1b2608d..da07284cfd2bc86ca0e65fbda69f5e7fe6b0e556 100644 (file)
--- a/test/stdout/0183
+++ b/test/stdout/0183
@@ -2,31 +2,31 @@ userx@test.again.dns cannot be resolved at this time: host lookup did not comple
 abcd@test.again.dns cannot be resolved at this time: host lookup did not complete
 abcd@ten-1.test.ex
   router = lookuphost, transport = smtp
 abcd@test.again.dns cannot be resolved at this time: host lookup did not complete
 abcd@ten-1.test.ex
   router = lookuphost, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 usery@test.again.dns cannot be resolved at this time: host lookup for test.again.dns did not complete (DNS timeout?)
 userz@test.again.dns cannot be resolved at this time: host lookup for test.again.dns did not complete (DNS timeout?)
 xyz@ten-1.test.ex
   router = lookuphost, transport = smtp
 usery@test.again.dns cannot be resolved at this time: host lookup for test.again.dns did not complete (DNS timeout?)
 userz@test.again.dns cannot be resolved at this time: host lookup for test.again.dns did not complete (DNS timeout?)
 xyz@ten-1.test.ex
   router = lookuphost, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 userx@test.fail.dns cannot be resolved at this time: host lookup did not complete
 abcd@test.fail.dns cannot be resolved at this time: host lookup did not complete
 abcd@ten-1.test.ex
   router = lookuphost, transport = smtp
 userx@test.fail.dns cannot be resolved at this time: host lookup did not complete
 abcd@test.fail.dns cannot be resolved at this time: host lookup did not complete
 abcd@ten-1.test.ex
   router = lookuphost, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 usery@test.fail.dns cannot be resolved at this time: host lookup for test.fail.dns did not complete (DNS timeout?)
 userz@test.fail.dns cannot be resolved at this time: host lookup for test.fail.dns did not complete (DNS timeout?)
 xyz@ten-1.test.ex
   router = lookuphost, transport = smtp
 usery@test.fail.dns cannot be resolved at this time: host lookup for test.fail.dns did not complete (DNS timeout?)
 userz@test.fail.dns cannot be resolved at this time: host lookup for test.fail.dns did not complete (DNS timeout?)
 xyz@ten-1.test.ex
   router = lookuphost, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 userx@nonexist.test.ex is undeliverable: Unrouteable address
 abcd@nonexist.test.ex is undeliverable: Unrouteable address
 abcd@ten-1.test.ex
   router = lookuphost, transport = smtp
 userx@nonexist.test.ex is undeliverable: Unrouteable address
 abcd@nonexist.test.ex is undeliverable: Unrouteable address
 abcd@ten-1.test.ex
   router = lookuphost, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 usery@nonexist.test.ex cannot be resolved at this time: lookup of host "nonexist.test.ex" failed in useryz router
 userz@nonexist.test.ex cannot be resolved at this time: lookup of host "nonexist.test.ex" failed in useryz router
 xyz@ten-1.test.ex
   router = lookuphost, transport = smtp
 usery@nonexist.test.ex cannot be resolved at this time: lookup of host "nonexist.test.ex" failed in useryz router
 userz@nonexist.test.ex cannot be resolved at this time: lookup of host "nonexist.test.ex" failed in useryz router
 xyz@ten-1.test.ex
   router = lookuphost, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 srv@test.again.dns cannot be resolved at this time: host lookup did not complete
 srv@test.fail.dns cannot be resolved at this time: host lookup did not complete
 srv@test.again.dns cannot be resolved at this time: host lookup did not complete
 srv@test.fail.dns cannot be resolved at this time: host lookup did not complete

diff --git a/test/stdout/0186 b/test/stdout/0186
index bfe0227cca9f1b90b6c8d19638364a37db096298..142f07f5f659f4a5f41c0effbb428fc64e18ee46 100644 (file)
--- a/test/stdout/0186
+++ b/test/stdout/0186
@@ -1,6 +1,6 @@
 userx@other2.test.ex
   router = lookuphost, transport = smtp
 userx@other2.test.ex
   router = lookuphost, transport = smtp

-  host other2.test.ex [V4NET.12.3.1]  ad=no
+  host other2.test.ex [V4NET.12.3.1] ad=no

 userx@ten-5-6.test.ex
   router = domainlist, transport = smtp
 userx@ten-5-6.test.ex
   router = domainlist, transport = smtp

-  host ten-5-6.test.ex [V4NET.0.0.5]  ad=no
+  host ten-5-6.test.ex [V4NET.0.0.5] ad=no

diff --git a/test/stdout/0187 b/test/stdout/0187
index be62b6e4494551b41589bdd0d54c90ca5805209d..2bfd2b80adfacb87aefdbaeb78b87cb69a0bf4be 100644 (file)
--- a/test/stdout/0187
+++ b/test/stdout/0187
@@ -1,9 +1,9 @@
 userx@other2.test.ex
   router = lookuphost2, transport = smtp
 userx@other2.test.ex
   router = lookuphost2, transport = smtp

-  host other2.test.ex [V4NET.12.3.1]  ad=no
+  host other2.test.ex [V4NET.12.3.1] ad=no

 userx@ten-5-6.test.ex
   router = domainlist, transport = smtp
 userx@ten-5-6.test.ex
   router = domainlist, transport = smtp

-  host ten-5-6.test.ex [V4NET.0.0.5]  ad=no
+  host ten-5-6.test.ex [V4NET.0.0.5] ad=no

 userx@mxt7.test.ex
   router = lookuphost, transport = smtp
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 userx@mxt7.test.ex
   router = lookuphost, transport = smtp
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no


@@ -12,7 +12,7 @@ userx@mxt9.test.ex
   host ten-3.test.ex [V4NET.0.0.3] MX=7 ad=no
 userx@eximtesthost.test.ex
   router = lookuphost2, transport = smtp
   host ten-3.test.ex [V4NET.0.0.3] MX=7 ad=no
 userx@eximtesthost.test.ex
   router = lookuphost2, transport = smtp

-  host eximtesthost.test.ex [ip4.ip4.ip4.ip4]  ad=no
+  host eximtesthost.test.ex [ip4.ip4.ip4.ip4] ad=no

 userx@localhost is undeliverable: Unrouteable address
 userx@mxt10.test.ex is undeliverable: all relevant MX records point to non-existent hosts
 userx@mxt11.test.ex is undeliverable: all relevant MX records point to non-existent hosts
 userx@localhost is undeliverable: Unrouteable address
 userx@mxt10.test.ex is undeliverable: all relevant MX records point to non-existent hosts
 userx@mxt11.test.ex is undeliverable: all relevant MX records point to non-existent hosts

diff --git a/test/stdout/0190 b/test/stdout/0190
index 351d707228129905c2adf1a00199dd6bbf386002..4308a1401a7fd57c076856d808126408a7f97894 100644 (file)
--- a/test/stdout/0190
+++ b/test/stdout/0190
@@ -1,114 +1,114 @@
 x@x
   router = others, transport = smtp2
 x@x
   router = others, transport = smtp2

-  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
-  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
-  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3] ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2] ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1] ad=no

 x@y
   router = others, transport = smtp2
 x@y
   router = others, transport = smtp2

-  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
-  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
-  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1] ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2] ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3] ad=no

 x@z
   router = others, transport = smtp2
 x@z
   router = others, transport = smtp2

-  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
-  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
-  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3] ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2] ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1] ad=no

 x@batch
   router = batched, transport = smtp2
 x@batch
   router = batched, transport = smtp2

-  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
-  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
-  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
-  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
-  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
-  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
-  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3] ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2] ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1] ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4] ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5] ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6] ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7] ad=no

 y@batch
   router = batched, transport = smtp2
 y@batch
   router = batched, transport = smtp2

-  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
-  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
-  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
-  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
-  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
-  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
-  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2] ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1] ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3] ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6] ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4] ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5] ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7] ad=no

 z@batch
   router = batched, transport = smtp2
 z@batch
   router = batched, transport = smtp2

-  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
-  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
-  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
-  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
-  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
-  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
-  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1] ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3] ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2] ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5] ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4] ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6] ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7] ad=no

 x@batch2
   router = batched, transport = smtp2
 x@batch2
   router = batched, transport = smtp2

-  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
-  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
-  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
-  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
-  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
-  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
-  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1] ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2] ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3] ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4] ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5] ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6] ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7] ad=no

 y@batch2
   router = batched, transport = smtp2
 y@batch2
   router = batched, transport = smtp2

-  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
-  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
-  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
-  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
-  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
-  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
-  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1] ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2] ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3] ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4] ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5] ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6] ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7] ad=no

 x@batch3
   router = batched2, transport = smtp2
 x@batch3
   router = batched2, transport = smtp2

-  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
-  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
-  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
-  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
-  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
-  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
-  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1] ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2] ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3] ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4] ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5] ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6] ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7] ad=no

 y@batch3
   router = batched2, transport = smtp2
 y@batch3
   router = batched2, transport = smtp2

-  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
-  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
-  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
-  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
-  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
-  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
-  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1] ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2] ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3] ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4] ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5] ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6] ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7] ad=no

 x@batch4
   router = batched2, transport = smtp2
 x@batch4
   router = batched2, transport = smtp2

-  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
-  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
-  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
-  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
-  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
-  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
-  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1] ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2] ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3] ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5] ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4] ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6] ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7] ad=no

 y@batch4
   router = batched2, transport = smtp2
 y@batch4
   router = batched2, transport = smtp2

-  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
-  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
-  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
-  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
-  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
-  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
-  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2] ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1] ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3] ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5] ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6] ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4] ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7] ad=no

 userx@bdomain1
   router = r3, transport = smtp2
 userx@bdomain1
   router = r3, transport = smtp2

-  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]  ad=no
-  host 127.0.0.1 [127.0.0.1]     ad=no
-  host the.local.host.name [ip4.ip4.ip4.ip4]  ad=no
+  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] ad=no
+  host 127.0.0.1 [127.0.0.1] ad=no
+  host the.local.host.name [ip4.ip4.ip4.ip4] ad=no

 userx@bdomain2
   router = r3, transport = smtp2
 userx@bdomain2
   router = r3, transport = smtp2

-  host the.local.host.name [ip4.ip4.ip4.ip4]  ad=no
-  host 127.0.0.1 [127.0.0.1]     ad=no
-  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]  ad=no
+  host the.local.host.name [ip4.ip4.ip4.ip4] ad=no
+  host 127.0.0.1 [127.0.0.1] ad=no
+  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] ad=no

 userx@bdomain3
   router = r3, transport = smtp2
 userx@bdomain3
   router = r3, transport = smtp2

-  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]  ad=no
-  host 127.0.0.1 [127.0.0.1]     ad=no
-  host the.local.host.name [ip4.ip4.ip4.ip4]  ad=no
+  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] ad=no
+  host 127.0.0.1 [127.0.0.1] ad=no
+  host the.local.host.name [ip4.ip4.ip4.ip4] ad=no

 
 ******** SERVER ********
 Listening on port 1224 ... 
 
 ******** SERVER ********
 Listening on port 1224 ... 

diff --git a/test/stdout/0239 b/test/stdout/0239
index 64edde126433dbc28404a824e8cb3d670f131ced..ed651522a7358c0553b9f86b6ef21da3d22beec7 100644 (file)
--- a/test/stdout/0239
+++ b/test/stdout/0239
@@ -10,4 +10,4 @@ userx@localhost
   host a.host.name ad=no
 userx@smtp
   router = sss, transport = smtp
   host a.host.name ad=no
 userx@smtp
   router = sss, transport = smtp

-  host 127.0.0.1 [127.0.0.1]  ad=no
+  host 127.0.0.1 [127.0.0.1] ad=no

diff --git a/test/stdout/0344 b/test/stdout/0344
index 7d49c555c3039b3390c28af6151f4ac7554779c0..74097f1b47eab32332b9d219bb626698710be794 100644 (file)
--- a/test/stdout/0344
+++ b/test/stdout/0344
@@ -1,12 +1,12 @@
 x@d1
   router = r1, transport = t1
 x@d1
   router = r1, transport = t1

-  host 192.168.4.3 [192.168.4.3]  ad=no
+  host 192.168.4.3 [192.168.4.3] ad=no

 x@d2
   router = r2, transport = t2
 x@d2
   router = r2, transport = t2

-  host V4NET.9.8.7 [V4NET.9.8.7]  ad=no
+  host V4NET.9.8.7 [V4NET.9.8.7] ad=no

 x@d30
   router = r3, transport = t4
 x@d30
   router = r3, transport = t4

-  host 1.2.3.4 [1.2.3.4]  ad=no
+  host 1.2.3.4 [1.2.3.4] ad=no

 x@d31
   router = r3, transport = t3
 x@d31
   router = r3, transport = t3

-  host 1.2.3.4 [1.2.3.4]  ad=no
+  host 1.2.3.4 [1.2.3.4] ad=no

diff --git a/test/stdout/0350 b/test/stdout/0350
index 8631b6f2b1f1ed0d3b9d966c28fee09798e1a778..06d4e8c3c2940038541937a5b8ed3e439f52a96a 100644 (file)
--- a/test/stdout/0350
+++ b/test/stdout/0350
@@ -1,4 +1,4 @@
 xx@yy
   router = r1, transport = t1
 xx@yy
   router = r1, transport = t1

-  host 1.2.3.4 [1.2.3.4]     ad=no
-  host other2.test.ex [V4NET.12.3.2]  ad=no
+  host 1.2.3.4 [1.2.3.4] ad=no
+  host other2.test.ex [V4NET.12.3.2] ad=no

diff --git a/test/stdout/0364 b/test/stdout/0364
index 4b3ad2308ff50a242cd474c0f55946e24830097a..5ea9045862ec66a1fc630d3fdfddc1f16c088422 100644 (file)
--- a/test/stdout/0364
+++ b/test/stdout/0364
@@ -7,9 +7,9 @@ solik@otherhost.sub.test.ex is undeliverable: Can't route to otherhost.sub.test.
 xxx@ten-1.test.ex
     <-- xxx@ten-1
   router = r2, transport = t1
 xxx@ten-1.test.ex
     <-- xxx@ten-1
   router = r2, transport = t1

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 xxx@testsub.sub.test.ex
     <-- xxx@testsub.test.ex
     <-- xxx@testsub
   router = r2, transport = t1
 xxx@testsub.sub.test.ex
     <-- xxx@testsub.test.ex
     <-- xxx@testsub
   router = r2, transport = t1

-  host testsub.sub.test.ex [V4NET.99.0.3]  ad=no
+  host testsub.sub.test.ex [V4NET.99.0.3] ad=no

diff --git a/test/stdout/0368 b/test/stdout/0368
index 7302d740bef1dba83ee97e69662af2588eff30a9..1534424355716b595ca06281d91a4eb1f250865d 100644 (file)
--- a/test/stdout/0368
+++ b/test/stdout/0368
@@ -9,6 +9,6 @@ x@mxt14.test.ex
   host ten-5-6.test.ex [V4NET.0.0.6] MX=4 ad=no
 x@manualroute
   router = r1, transport = t1
   host ten-5-6.test.ex [V4NET.0.0.6] MX=4 ad=no
 x@manualroute
   router = r1, transport = t1

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
-  host ten-2.test.ex [V4NET.0.0.2]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no
+  host ten-2.test.ex [V4NET.0.0.2] ad=no

diff --git a/test/stdout/0430 b/test/stdout/0430
index 75887bedc0e44adb45cdf89ebf16d37e6b657999..425296e1265ef61cad2d68c0acd6ccc89d0c10aa 100644 (file)
--- a/test/stdout/0430
+++ b/test/stdout/0430
@@ -1,19 +1,19 @@
 x@manual.route
   router = r1, transport = t1
 x@manual.route
   router = r1, transport = t1

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 x@manual.route
   router = r1, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 x@manual.route
   router = r1, transport = t1

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no

-  host ten-6.test.ex [V4NET.0.0.6]  ad=no
+  host ten-6.test.ex [V4NET.0.0.6] ad=no

 x@manual.route
   router = r1, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 x@manual.route
   router = r1, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no

-  host ten-6.test.ex [V4NET.0.0.6]  ad=no
+  host ten-6.test.ex [V4NET.0.0.6] ad=no

 x@random.manual.route
   router = r2, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
 x@random.manual.route
   router = r2, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no


@@ -22,38 +22,38 @@ x@random.manual.route
   router = r2, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
   router = r2, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 x@random.manual.route
   router = r2, transport = t1
 x@random.manual.route
   router = r2, transport = t1

-  host ten-6.test.ex [V4NET.0.0.6]  ad=no
+  host ten-6.test.ex [V4NET.0.0.6] ad=no

   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 y@random.manual.route
   router = r2, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 y@random.manual.route
   router = r2, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no

-  host ten-6.test.ex [V4NET.0.0.6]  ad=no
-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-6.test.ex [V4NET.0.0.6] ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 x@random.manual.route
   router = r2, transport = t1
 x@random.manual.route
   router = r2, transport = t1

-  host ten-6.test.ex [V4NET.0.0.6]  ad=no
+  host ten-6.test.ex [V4NET.0.0.6] ad=no

   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 x@manual.route
   router = r1, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
   host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 x@manual.route
   router = r1, transport = t1

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 x@manual.route cannot be resolved at this time: lowest numbered MX record points to local host
 x@manual.route
   router = r1, transport = t1
   host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no
   host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5 ad=no
 x@manual.route cannot be resolved at this time: lowest numbered MX record points to local host
 x@manual.route
   router = r1, transport = t1
   host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no
   host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5 ad=no

-  host ten-6.test.ex [V4NET.0.0.6]     ad=no
+  host ten-6.test.ex [V4NET.0.0.6] ad=no

 x@manual.route is undeliverable: lowest numbered MX record points to local host
 x@random.manual.route cannot be resolved at this time: lookup of host "localhost.test.ex" failed in r2 router
 x@random.manual.route
   router = r2, transport = t1
 x@manual.route is undeliverable: lowest numbered MX record points to local host
 x@random.manual.route cannot be resolved at this time: lookup of host "localhost.test.ex" failed in r2 router
 x@random.manual.route
   router = r2, transport = t1

-  host ten-6.test.ex [V4NET.0.0.6]  ad=no
+  host ten-6.test.ex [V4NET.0.0.6] ad=no

   host ten-1.test.ex [V4NET.0.0.1] MX=6 ad=no
 x@manual.route
   router = r1, transport = t1
   host ten-1.test.ex [V4NET.0.0.1] MX=6 ad=no
 x@manual.route
   router = r1, transport = t1

diff --git a/test/stdout/0434 b/test/stdout/0434
index ed4e976ecfabdad506f03fb26025137f827b7ce8..7b8cf4afc342e4495c02571adaf780bac6b798a0 100644 (file)
--- a/test/stdout/0434
+++ b/test/stdout/0434
@@ -1,4 +1,4 @@
 a@b
   router = r1, transport = t1
 a@b
   router = r1, transport = t1

-  host 1.2.3.4 [1.2.3.4]  ad=no
+  host 1.2.3.4 [1.2.3.4] ad=no

 a@b cannot be resolved at this time: remote host address is the local host
 a@b cannot be resolved at this time: remote host address is the local host

diff --git a/test/stdout/0463 b/test/stdout/0463
index 27d6cfe3120b7639438a5c4008455c329977a3b1..5ede511b7d5598263417d98666b8a1c6202ec871 100644 (file)
--- a/test/stdout/0463
+++ b/test/stdout/0463
@@ -1,4 +1,4 @@
 x@ten-1.test.ex
     <-- x@ten-1
   router = all, transport = smtp
 x@ten-1.test.ex
     <-- x@ten-1
   router = all, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

diff --git a/test/stdout/0466 b/test/stdout/0466
index 71fd0dada3be7577e1dff2705b0666332755e860..dc6e2a757b022a95508a17e6a453f54673dddaac 100644 (file)
--- a/test/stdout/0466
+++ b/test/stdout/0466
@@ -1,3 +1,3 @@
 x@y
   router = r1, transport = t1
 x@y
   router = r1, transport = t1

-  host 127.0.0.1 [127.0.0.1]  ad=no
+  host 127.0.0.1 [127.0.0.1] ad=no

diff --git a/test/stdout/0545 b/test/stdout/0545
index 9936abc5e54e2b6961a534d71d8f2cb676440066..5018b9799ae99f3f0bf688f29dadcf09453c234e 100644 (file)
--- a/test/stdout/0545
+++ b/test/stdout/0545
@@ -1,7 +1,7 @@
 userx@alias-eximtesthost.test.ex
     <-- userx@alias-eximtesthost
   router = dns, transport = smtp
 userx@alias-eximtesthost.test.ex
     <-- userx@alias-eximtesthost
   router = dns, transport = smtp

-  host eximtesthost.test.ex [ip4.ip4.ip4.ip4]  ad=no
+  host eximtesthost.test.ex [ip4.ip4.ip4.ip4] ad=no

 userx@alias-eximtesthost.test.ex
   router = dns, transport = smtp
 userx@alias-eximtesthost.test.ex
   router = dns, transport = smtp

-  host eximtesthost.test.ex [ip4.ip4.ip4.ip4]  ad=no
+  host eximtesthost.test.ex [ip4.ip4.ip4.ip4] ad=no

diff --git a/test/stdout/0557 b/test/stdout/0557
index cd31b5c02968405077e242a384d4a46c1aeab969..031265dd84c3208a9035df0ac54702318a088d0c 100644 (file)
--- a/test/stdout/0557
+++ b/test/stdout/0557
@@ -3,11 +3,11 @@ userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1
 userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=defer
 userx@test.ex
   router = r1, transport = t1
 userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=defer
 userx@test.ex
   router = r1, transport = t1

-  host 127.0.0.1 [127.0.0.1]  ad=no
+  host 127.0.0.1 [127.0.0.1] ad=no

 userx@test.ex
   router = r1, transport = t1
 userx@test.ex
   router = r1, transport = t1

-  host 127.0.0.1 [127.0.0.1]  ad=no
-  host 127.0.0.2 [127.0.0.2]  ad=no
+  host 127.0.0.1 [127.0.0.1] ad=no
+  host 127.0.0.2 [127.0.0.2] ad=no

 userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=defer
 userx@test.ex is undeliverable: Unrouteable address
 userx@test.ex is undeliverable: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=fail
 userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=defer
 userx@test.ex is undeliverable: Unrouteable address
 userx@test.ex is undeliverable: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=fail

diff --git a/test/stdout/5204 b/test/stdout/5204
index 7c61dad63f57716c17d1e27636b864acefd69382..361f114d592a5274221ead55d8a4f02986ad716e 100644 (file)
--- a/test/stdout/5204
+++ b/test/stdout/5204
@@ -5,10 +5,10 @@
 "DEFER cannot route this one (DEFER)"@some.host cannot be resolved at this time: cannot route this one (DEFER)
 "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
   router = q, transport = other_smtp
 "DEFER cannot route this one (DEFER)"@some.host cannot be resolved at this time: cannot route this one (DEFER)
 "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
   router = q, transport = other_smtp

-  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] ad=no

 PASS@some.host
   router = s, transport = smtp
 PASS@some.host
   router = s, transport = smtp

-  host 127.0.0.1 [127.0.0.1]  ad=no
+  host 127.0.0.1 [127.0.0.1] ad=no

 "FREEZE cannot route this one (FREEZE)"@some.host cannot be resolved at this time: cannot route this one (FREEZE)
 postmaster@test.ex
     <-- "REDIRECT postmaster@test.ex"@some.host
 "FREEZE cannot route this one (FREEZE)"@some.host cannot be resolved at this time: cannot route this one (FREEZE)
 postmaster@test.ex
     <-- "REDIRECT postmaster@test.ex"@some.host

diff --git a/test/stdout/5300 b/test/stdout/5300
index 5995ccd4fd255868cd9c5e94a8ceb81b6dd60057..855ff5671b45ca63512abf48156f5039809ecf29 100644 (file)
--- a/test/stdout/5300
+++ b/test/stdout/5300
@@ -1,6 +1,6 @@
 x@[V4NET.9.8.7]
   router = r1, transport = t1
 x@[V4NET.9.8.7]
   router = r1, transport = t1

-  host [V4NET.9.8.7] [V4NET.9.8.7]  ad=no
+  host [V4NET.9.8.7] [V4NET.9.8.7] ad=no

 x@[127.0.0.1]
   router = r3, transport = t1
  0m   sss 10HmaX-0005vi-00 <y@[10.9.8.7]>
 x@[127.0.0.1]
   router = r3, transport = t1
  0m   sss 10HmaX-0005vi-00 <y@[10.9.8.7]>