Logging: add I= element to transport-defer lines. Bug 2675

[users/heiko/exim.git] / test / stdout / 0430

diff --git a/test/stdout/0430 b/test/stdout/0430
index 425296e1265ef61cad2d68c0acd6ccc89d0c10aa..1229b0ef83d816d4e485116ed20bc67759c4e245 100644 (file)
--- a/test/stdout/0430
+++ b/test/stdout/0430
@@ -1,61 +1,61 @@
 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-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]
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6

 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-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]
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-6.test.ex [V4NET.0.0.6]

 x@manual.route
   router = r1, transport = t1
 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-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-6.test.ex [V4NET.0.0.6]

 x@random.manual.route
   router = r2, transport = t1
 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
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6

 x@random.manual.route
   router = r2, transport = t1
 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
-  host ten-1.test.ex [V4NET.0.0.1] ad=no
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-1.test.ex [V4NET.0.0.1]

 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-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-6.test.ex [V4NET.0.0.6]
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-1.test.ex [V4NET.0.0.1]

 y@random.manual.route
   router = r2, transport = t1
 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-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-6.test.ex [V4NET.0.0.6]
+  host ten-1.test.ex [V4NET.0.0.1]

 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-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]
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6

 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]

 x@manual.route cannot be resolved at this time: lowest numbered MX record points to local host
 x@manual.route
   router = r1, transport = t1
 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-1.test.ex [V4NET.0.0.1] MX=5
+  host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5
+  host ten-6.test.ex [V4NET.0.0.6]

 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-1.test.ex [V4NET.0.0.1] MX=6 ad=no
+  host ten-6.test.ex [V4NET.0.0.6]
+  host ten-1.test.ex [V4NET.0.0.1] MX=6

 x@manual.route
   router = r1, transport = t1
 x@manual.route
   router = r1, transport = t1

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