X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fstdout%2F0430;h=425296e1265ef61cad2d68c0acd6ccc89d0c10aa;hb=937664c1820ef8efd36304abbf650a96c8180d7a;hp=19713dbd65eef326083d042134d5f1c839b2f38f;hpb=54c5ebb14ead7439af300e9d7d9d7d2ba29ff32e;p=exim.git

diff --git a/test/stdout/0430 b/test/stdout/0430
index 19713dbd6..425296e12 100644
--- a/test/stdout/0430
+++ b/test/stdout/0430
@@ -1,60 +1,61 @@
 x@manual.route
   router = r1, transport = t1
-  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-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-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] 
+  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
 x@manual.route
   router = r1, transport = t1
-  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-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
 x@random.manual.route
   router = r2, transport = t1
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  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@random.manual.route
   router = r2, transport = t1
-  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] 
+  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
 x@random.manual.route
   router = r2, transport = t1
-  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] 
+  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
 y@random.manual.route
   router = r2, transport = t1
-  host ten-6.test.ex [V4NET.0.0.6] 
-  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-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
 x@random.manual.route
   router = r2, transport = t1
-  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-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-1.test.ex [V4NET.0.0.1] 
-x@manual.route cannot be resolved at this time:
-  lowest numbered MX record points to local host
+  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 eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5
-  host ten-1.test.ex [V4NET.0.0.1] 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
+  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
+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] 
-  host ten-1.test.ex [V4NET.0.0.1] MX=6
+  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=10 ad=no
+  host ten-2.test.ex [V4NET.0.0.2] MX=20 ad=no