Content scan: Use ETIMEDOUT not ETIME, as having better portability. Bug 1640

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

diff --git a/test/stdout/1006 b/test/stdout/1006
index df65718fe1bf31ac413960ac8439c482031d66f3..663e3fee72a9e1128935fbe8584e9c775c2e9225 100644 (file)
--- a/test/stdout/1006
+++ b/test/stdout/1006
@@ -1,22 +1,21 @@
 dnslookup@mx46.test.ex
   router = r1, transport = smtp
 dnslookup@mx46.test.ex
   router = r1, transport = smtp

-  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46
-  host 46.test.ex [V4NET.0.0.4] MX=46
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 ad=no
+  host 46.test.ex [V4NET.0.0.4] MX=46 ad=no

 manualroute@test.ex
   router = r2, transport = smtp
 manualroute@test.ex
   router = r2, transport = smtp

-  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] 
-  host 46.test.ex [V4NET.0.0.4]                          
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] ad=no
+  host 46.test.ex [V4NET.0.0.4] ad=no

 dnslookup@v6.test.ex
   router = r1, transport = smtp
 dnslookup@v6.test.ex
   router = r1, transport = smtp

-  host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] 
+  host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] ad=no

 dnslookup@mx46.test.ex
   router = r1, transport = smtp
 dnslookup@mx46.test.ex
   router = r1, transport = smtp

-  host 46.test.ex [V4NET.0.0.4] MX=46
+  host 46.test.ex [V4NET.0.0.4] MX=46 ad=no

 manualroute@test.ex
   router = r2, transport = smtp
 manualroute@test.ex
   router = r2, transport = smtp

-  host 46.test.ex [V4NET.0.0.4] 
-dnslookup@v6.test.ex is undeliverable:
-  Unrouteable address
+  host 46.test.ex [V4NET.0.0.4] ad=no
+dnslookup@v6.test.ex is undeliverable: Unrouteable address

 Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000


@@ -24,4 +23,4 @@ Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script

-Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... failed: Connection refused
+Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connect failed: Connection refused