Fix logging of drop-after-EHLO-reject.

[exim.git] / test / stdout / 0183

diff --git a/test/stdout/0183 b/test/stdout/0183
index 7582da94e288a08f881332f17cc084b56e52f3a0..66b21e58a015b11e94c320c18ab19587774e16ca 100644 (file)
--- a/test/stdout/0183
+++ b/test/stdout/0183
@@ -1,46 +1,32 @@
-userx@test.again.dns cannot be resolved at this time:
-  host lookup did not complete
-abcd@test.again.dns cannot be resolved at this time:
-  host lookup did not complete
+userx@test.again.dns cannot be resolved at this time: host lookup did not complete
+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@ten-1.test.ex
   router = lookuphost, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1] 
-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?)
+  host ten-1.test.ex [V4NET.0.0.1]
+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
 xyz@ten-1.test.ex
   router = lookuphost, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1] 
-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
+  host ten-1.test.ex [V4NET.0.0.1]
+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
 abcd@ten-1.test.ex
   router = lookuphost, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1] 
-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?)
+  host ten-1.test.ex [V4NET.0.0.1]
+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
 xyz@ten-1.test.ex
   router = lookuphost, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1] 
-userx@nonexist.test.ex is undeliverable:
-  Unrouteable address
-abcd@nonexist.test.ex is undeliverable:
-  Unrouteable address
+  host ten-1.test.ex [V4NET.0.0.1]
+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
 abcd@ten-1.test.ex
   router = lookuphost, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1] 
-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
+  host ten-1.test.ex [V4NET.0.0.1]
+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
 xyz@ten-1.test.ex
   router = lookuphost, transport = smtp

-  host ten-1.test.ex [V4NET.0.0.1] 
-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
+  host ten-1.test.ex [V4NET.0.0.1]
+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