[exim-cvs] cvs commit: exim/exim-test/stdout 0045 0053 0054 …

Página superior
Eliminar este mensaje
Responder a este mensaje
Autor: Philip Hazel
Fecha:  
A: exim-cvs
Asunto: [exim-cvs] cvs commit: exim/exim-test/stdout 0045 0053 0054 0057 0078 0085 0088 0089 0123 0126 0129 0130 0141 0145 0153 0156 0161 0172 0183 0187 0200 0205 0235 0238 0263 0265 0267 0268 0269 0271 027
ph10 2006/10/09 15:38:58 BST

  Modified files:
    exim-test/stdout     0045 0053 0054 0057 0078 0085 0088 0089 
                         0123 0126 0129 0130 0141 0145 0153 0156 
                         0161 0172 0183 0187 0200 0205 0235 0238 
                         0263 0265 0267 0268 0269 0271 0272 0273 
                         0278 0279 0305 0334 0364 0399 0424 0430 
                         0434 0467 0469 1005 1006 2201 2501 3206 
                         3210 4950 5204 5205 5206 5209 
  Log:
  Update tests after reformatting exim -bt message


  Revision  Changes    Path
  1.2       +7 -14     exim/exim-test/stdout/0045
  1.2       +1 -2      exim/exim-test/stdout/0053
  1.2       +1 -2      exim/exim-test/stdout/0054
  1.2       +4 -8      exim/exim-test/stdout/0057
  1.2       +1 -2      exim/exim-test/stdout/0078
  1.2       +6 -12     exim/exim-test/stdout/0085
  1.2       +3 -6      exim/exim-test/stdout/0088
  1.3       +1 -2      exim/exim-test/stdout/0089
  1.2       +3 -6      exim/exim-test/stdout/0123
  1.2       +1 -2      exim/exim-test/stdout/0126
  1.2       +2 -4      exim/exim-test/stdout/0129
  1.2       +1 -2      exim/exim-test/stdout/0130
  1.2       +3 -6      exim/exim-test/stdout/0141
  1.2       +1 -2      exim/exim-test/stdout/0145
  1.2       +3 -6      exim/exim-test/stdout/0153
  1.2       +3 -6      exim/exim-test/stdout/0156
  1.2       +3 -6      exim/exim-test/stdout/0161
  1.2       +1 -2      exim/exim-test/stdout/0172
  1.2       +14 -28    exim/exim-test/stdout/0183
  1.2       +4 -8      exim/exim-test/stdout/0187
  1.2       +2 -4      exim/exim-test/stdout/0200
  1.2       +4 -4      exim/exim-test/stdout/0205
  1.2       +1 -2      exim/exim-test/stdout/0235
  1.2       +2 -4      exim/exim-test/stdout/0238
  1.2       +1 -2      exim/exim-test/stdout/0263
  1.2       +1 -2      exim/exim-test/stdout/0265
  1.2       +1 -2      exim/exim-test/stdout/0267
  1.2       +11 -22    exim/exim-test/stdout/0268
  1.2       +1 -2      exim/exim-test/stdout/0269
  1.2       +1 -2      exim/exim-test/stdout/0271
  1.2       +11 -22    exim/exim-test/stdout/0272
  1.3       +5 -10     exim/exim-test/stdout/0273
  1.2       +1 -2      exim/exim-test/stdout/0278
  1.2       +1 -2      exim/exim-test/stdout/0279
  1.2       +1 -2      exim/exim-test/stdout/0305
  1.2       +1 -2      exim/exim-test/stdout/0334
  1.2       +3 -2      exim/exim-test/stdout/0364
  1.2       +1 -2      exim/exim-test/stdout/0399
  1.2       +1 -2      exim/exim-test/stdout/0424
  1.4       +3 -6      exim/exim-test/stdout/0430
  1.2       +1 -2      exim/exim-test/stdout/0434
  1.4       +3 -6      exim/exim-test/stdout/0467
  1.2       +1 -2      exim/exim-test/stdout/0469
  1.2       +1 -2      exim/exim-test/stdout/1005
  1.3       +1 -2      exim/exim-test/stdout/1006
  1.2       +1 -2      exim/exim-test/stdout/2201
  1.2       +1 -2      exim/exim-test/stdout/2501
  1.2       +1 -2      exim/exim-test/stdout/3206
  1.2       +1 -2      exim/exim-test/stdout/3210
  1.2       +1 -2      exim/exim-test/stdout/4950
  1.3       +6 -12     exim/exim-test/stdout/5204
  1.2       +1 -2      exim/exim-test/stdout/5205
  1.2       +1 -2      exim/exim-test/stdout/5206
  1.2       +1 -2      exim/exim-test/stdout/5209


  Index: 0045
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0045,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0045    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0045    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,17 +1,10 @@
  -userx@??? cannot be resolved at this time:
  -  remote host address is the local host
  -userx@??? cannot be resolved at this time:
  -  lowest numbered MX record points to local host
  -userx@??? is undeliverable:
  -  all relevant MX records point to non-existent hosts
  -userx@??? is undeliverable:
  -  all relevant MX records point to non-existent hosts
  -userx@??? cannot be resolved at this time:
  -  lowest numbered MX record points to local host
  -userx@??? cannot be resolved at this time:
  -  lowest numbered MX record points to local host
  -userx@??? cannot be resolved at this time:
  -  lowest numbered MX record points to local host
  +userx@??? cannot be resolved at this time: remote host address is the local host
  +userx@??? cannot be resolved at this time: lowest numbered MX record points to local host
  +userx@??? is undeliverable: all relevant MX records point to non-existent hosts
  +userx@??? is undeliverable: all relevant MX records point to non-existent hosts
  +userx@??? cannot be resolved at this time: lowest numbered MX record points to local host
  +userx@??? cannot be resolved at this time: lowest numbered MX record points to local host
  +userx@??? cannot be resolved at this time: lowest numbered MX record points to local host
   userx@???
     router = lookuphost, transport = smtp
     host ten-1.test.ex [V4NET.0.0.1] MX=5


  Index: 0053
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0053,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0053    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0053    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,5 +1,4 @@
   userx@???
       <-- bar@???
     router = localuser, transport = local_delivery
  -foobar@??? is undeliverable:
  -  Unrouteable address
  +foobar@??? is undeliverable: Unrouteable address


  Index: 0054
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0054,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0054    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0054    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,5 +1,4 @@
   xxx@???
     router = lookuphost, transport = smtp
     host ten-1.test.ex [V4NET.0.0.1] 
  -xxx@??? is undeliverable:
  -  Unrouteable address
  +xxx@??? is undeliverable: Unrouteable address


  Index: 0057
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0057,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0057    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0057    9 Oct 2006 14:38:57 -0000    1.2
  @@ -14,12 +14,8 @@
   **** SMTP testing: that is not a real message id!


221 myhost.ex closing connection
-userx%myhost.ex@??? failed to verify:
- Unrouteable address
-userx%myhost.ex@??? failed to verify:
- Unrouteable address
-userx%myhost.ex@??? failed to verify:
- Unrouteable address
-userx%myhost.ex@??? failed to verify:
- Unrouteable address
+userx%myhost.ex@??? failed to verify: Unrouteable address
+userx%myhost.ex@??? failed to verify: Unrouteable address
+userx%myhost.ex@??? failed to verify: Unrouteable address
+userx%myhost.ex@??? failed to verify: Unrouteable address
userx%myhost.ex@??? verified

  Index: 0078
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0078,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0078    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0078    9 Oct 2006 14:38:57 -0000    1.2
  @@ -7,5 +7,4 @@
   xx@???
     router = self2, transport = remote_smtp
     host myhost.test.ex [V4NET.10.10.10] 
  -xx@??? is undeliverable:
  -  Unrouteable address
  +xx@??? is undeliverable: Unrouteable address


  Index: 0085
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0085,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0085    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0085    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,16 +1,10 @@
  -x@??? failed to verify:
  -  unrouteable mail domain "y.z"
  +x@??? failed to verify: unrouteable mail domain "y.z"
   x@???
     router = smart1, transport = unset
   x@???
     router = smart2, transport = dummy
  -x@??? failed to verify:
  -  Unrouteable address
  -x@??? failed to verify:
  -  unrouteable mail domain "y.z"
  -x@??? failed to verify:
  -  unrouteable mail domain "smart.domain"
  -x@??? failed to verify:
  -  Unrouteable address
  -x@??? failed to verify:
  -  Unrouteable address
  +x@??? failed to verify: Unrouteable address
  +x@??? failed to verify: unrouteable mail domain "y.z"
  +x@??? failed to verify: unrouteable mail domain "smart.domain"
  +x@??? failed to verify: Unrouteable address
  +x@??? failed to verify: Unrouteable address


  Index: 0088
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0088,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0088    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0088    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,6 +1,3 @@
  -xx@??? cannot be resolved at this time:
  -  remote host address is the local host
  -xx@??? cannot be resolved at this time:
  -  remote host address is the local host
  -xx@??? cannot be resolved at this time:
  -  lowest numbered MX record points to local host
  +xx@??? cannot be resolved at this time: remote host address is the local host
  +xx@??? cannot be resolved at this time: remote host address is the local host
  +xx@??? cannot be resolved at this time: lowest numbered MX record points to local host


  Index: 0089
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0089,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0089    27 Jul 2006 11:29:32 -0000    1.2
  +++ 0089    9 Oct 2006 14:38:57 -0000    1.3
  @@ -37,5 +37,4 @@
   XYZ@???
     router = manual, transport = dummy
     host ten-1.test.ex [V4NET.0.0.1] 
  -xyz@??? is undeliverable:
  -  unrouteable mail domain "ten-1.test.ex"
  +xyz@??? is undeliverable: unrouteable mail domain "ten-1.test.ex"


  Index: 0123
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0123,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0123    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0123    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,6 +1,3 @@
  -x@??? is undeliverable:
  -  Unrouteable address
  -y@??? is undeliverable:
  -  Unrouteable address
  -z@??? is undeliverable:
  -  Unrouteable address
  +x@??? is undeliverable: Unrouteable address
  +y@??? is undeliverable: Unrouteable address
  +z@??? is undeliverable: Unrouteable address


  Index: 0126
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0126,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0126    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0126    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -userx@??? is undeliverable:
  -  Unrouteable address
  +userx@??? is undeliverable: Unrouteable address


  Index: 0129
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0129,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0129    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0129    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,4 +1,2 @@
  -xxx@??? failed to verify:
  -  Just testing
  -xxx@??? failed to verify:
  -  Just testing
  +xxx@??? failed to verify: Just testing
  +xxx@??? failed to verify: Just testing


  Index: 0130
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0130,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0130    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0130    9 Oct 2006 14:38:57 -0000    1.2
  @@ -7,5 +7,4 @@
   250 OK
   451 Temporary local problem - please try later
   221 the.local.host.name closing connection
  -userx@??? cannot be resolved at this time:
  -  remote host address is the local host
  +userx@??? cannot be resolved at this time: remote host address is the local host


  Index: 0141
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0141,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0141    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0141    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,6 +1,3 @@
  -xxx@??? failed to verify:
  -  Forced failure
  -xxx@??? is undeliverable:
  -  Forced failure
  -xxx@??? failed to verify:
  -  Unrouteable address
  +xxx@??? failed to verify: Forced failure
  +xxx@??? is undeliverable: Forced failure
  +xxx@??? failed to verify: Unrouteable address


  Index: 0145
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0145,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0145    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0145    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,5 +1,4 @@
  -x@??? is undeliverable:
  -  all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
  +x@??? is undeliverable: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses


**** SMTP testing session as if from host V4NET.9.8.7
**** but without any ident (RFC 1413) callback.

  Index: 0153
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0153,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0153    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0153    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,9 +1,6 @@
   abcd@??? verified
   yes@??? verified
  -no@??? failed to verify:
  -  Unrouteable address
  -xx@??? failed to verify:
  -  Unrouteable address
  +no@??? failed to verify: Unrouteable address
  +xx@??? failed to verify: Unrouteable address
   yes@??? verified
  -no@??? failed to verify:
  -  Unrouteable address
  +no@??? failed to verify: Unrouteable address


  Index: 0156
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0156,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0156    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0156    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,7 +1,4 @@
  -defer@??? cannot be resolved at this time:
  -  error in redirect data: ":defer: forced to defer" is not permitted
  +defer@??? cannot be resolved at this time: error in redirect data: ":defer: forced to defer" is not permitted
   file@??? -> /dev/null *** forbidden ***
  -include@??? cannot be resolved at this time:
  -  error in redirect data: included files not permitted
  -unknown@??? is undeliverable:
  -  Unrouteable address
  +include@??? cannot be resolved at this time: error in redirect data: included files not permitted
  +unknown@??? is undeliverable: Unrouteable address


  Index: 0161
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0161,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0161    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0161    9 Oct 2006 14:38:57 -0000    1.2
  @@ -7,9 +7,6 @@
   xx@???
     router = self2, transport = remote_smtp
     host myhost.test.ex [V4NET.10.10.10] 
  -xx@??? is undeliverable:
  -  Unrouteable address
  -ff@??? is undeliverable:
  -  lowest numbered MX record points to local host
  -fff@??? is undeliverable:
  -  lookup of host "fff" failed in fail router
  +xx@??? is undeliverable: Unrouteable address
  +ff@??? is undeliverable: lowest numbered MX record points to local host
  +fff@??? is undeliverable: lookup of host "fff" failed in fail router


  Index: 0172
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0172,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0172    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0172    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -unknown@??? is undeliverable:
  -  cannot route address
  +unknown@??? is undeliverable: cannot route address


  Index: 0183
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0183,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0183    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0183    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,46 +1,32 @@
  -userx@??? cannot be resolved at this time:
  -  host lookup did not complete
  -abcd@??? cannot be resolved at this time:
  -  host lookup did not complete
  +userx@??? cannot be resolved at this time: host lookup did not complete
  +abcd@??? cannot be resolved at this time: host lookup did not complete
   abcd@???
     router = lookuphost, transport = smtp
     host ten-1.test.ex [V4NET.0.0.1] 
  -usery@??? cannot be resolved at this time:
  -  host lookup for test.again.dns did not complete (DNS timeout?)
  -userz@??? cannot be resolved at this time:
  -  host lookup for test.again.dns did not complete (DNS timeout?)
  +usery@??? cannot be resolved at this time: host lookup for test.again.dns did not complete (DNS timeout?)
  +userz@??? cannot be resolved at this time: host lookup for test.again.dns did not complete (DNS timeout?)
   xyz@???
     router = lookuphost, transport = smtp
     host ten-1.test.ex [V4NET.0.0.1] 
  -userx@??? cannot be resolved at this time:
  -  host lookup did not complete
  -abcd@??? cannot be resolved at this time:
  -  host lookup did not complete
  +userx@??? cannot be resolved at this time: host lookup did not complete
  +abcd@??? cannot be resolved at this time: host lookup did not complete
   abcd@???
     router = lookuphost, transport = smtp
     host ten-1.test.ex [V4NET.0.0.1] 
  -usery@??? cannot be resolved at this time:
  -  host lookup for test.fail.dns did not complete (DNS timeout?)
  -userz@??? cannot be resolved at this time:
  -  host lookup for test.fail.dns did not complete (DNS timeout?)
  +usery@??? cannot be resolved at this time: host lookup for test.fail.dns did not complete (DNS timeout?)
  +userz@??? cannot be resolved at this time: host lookup for test.fail.dns did not complete (DNS timeout?)
   xyz@???
     router = lookuphost, transport = smtp
     host ten-1.test.ex [V4NET.0.0.1] 
  -userx@??? is undeliverable:
  -  Unrouteable address
  -abcd@??? is undeliverable:
  -  Unrouteable address
  +userx@??? is undeliverable: Unrouteable address
  +abcd@??? is undeliverable: Unrouteable address
   abcd@???
     router = lookuphost, transport = smtp
     host ten-1.test.ex [V4NET.0.0.1] 
  -usery@??? cannot be resolved at this time:
  -  lookup of host "nonexist.test.ex" failed in useryz router
  -userz@??? cannot be resolved at this time:
  -  lookup of host "nonexist.test.ex" failed in useryz router
  +usery@??? cannot be resolved at this time: lookup of host "nonexist.test.ex" failed in useryz router
  +userz@??? cannot be resolved at this time: lookup of host "nonexist.test.ex" failed in useryz router
   xyz@???
     router = lookuphost, transport = smtp
     host ten-1.test.ex [V4NET.0.0.1] 
  -srv@??? cannot be resolved at this time:
  -  host lookup did not complete
  -srv@??? cannot be resolved at this time:
  -  host lookup did not complete
  +srv@??? cannot be resolved at this time: host lookup did not complete
  +srv@??? cannot be resolved at this time: host lookup did not complete


  Index: 0187
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0187,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0187    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0187    9 Oct 2006 14:38:57 -0000    1.2
  @@ -13,11 +13,7 @@
   userx@???
     router = lookuphost2, transport = smtp
     host eximtesthost.test.ex [ip4.ip4.ip4.ip4] 
  -userx@localhost is undeliverable:
  -  Unrouteable address
  -userx@??? is undeliverable:
  -  all relevant MX records point to non-existent hosts
  -userx@??? is undeliverable:
  -  all relevant MX records point to non-existent hosts
  -userx@??? is undeliverable:
  -  all relevant MX records point to non-existent hosts
  +userx@localhost is undeliverable: Unrouteable address
  +userx@??? is undeliverable: all relevant MX records point to non-existent hosts
  +userx@??? is undeliverable: all relevant MX records point to non-existent hosts
  +userx@??? is undeliverable: all relevant MX records point to non-existent hosts


  Index: 0200
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0200,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0200    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0200    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,4 +1,2 @@
  -xx@??? is undeliverable:
  -  mail domain "host.test.ex._bad" is syntactically invalid
  -yy@??? cannot be resolved at this time:
  -  lookup of host "bad_host.test.ex" failed in domainlist router: syntax error in name
  +xx@??? is undeliverable: mail domain "host.test.ex._bad" is syntactically invalid
  +yy@??? cannot be resolved at this time: lookup of host "bad_host.test.ex" failed in domainlist router: syntax error in name


  Index: 0205
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0205,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0205    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0205    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,9 +1,9 @@
  -> x%y@??? is undeliverable:
  -  unrouteable mail domain "y"
  +> x@y is undeliverable: unrouteable mail domain "y"
  +    <-- x%y@???
   > x%y@???
     router = local_domains, transport = local_delivery
  -> x%y%testhack2.test.ex@??? is undeliverable:
  -  unrouteable mail domain "y"
  +> x@y is undeliverable: unrouteable mail domain "y"
  +    <-- x%y%testhack2.test.ex@???
   > X@???
       <-- X%test.ex@???
     router = local_domains, transport = local_delivery


  Index: 0235
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0235,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0235    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0235    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -xxx@??? is undeliverable:
  -  Unrouteable address
  +xxx@??? is undeliverable: Unrouteable address


  Index: 0238
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0238,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0238    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0238    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,4 +1,2 @@
  -userx@??? cannot be resolved at this time:
  -  failed to expand "${if eq{$local_part}" for require_files: missing 2nd string in {} after "eq"
  -xxx@??? cannot be resolved at this time:
  -  require_files: "un/qualified" is not absolute
  +userx@??? cannot be resolved at this time: failed to expand "${if eq{$local_part}" for require_files: missing 2nd string in {} after "eq"
  +xxx@??? cannot be resolved at this time: require_files: "un/qualified" is not absolute


  Index: 0263
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0263,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0263    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0263    9 Oct 2006 14:38:57 -0000    1.2
  @@ -2,5 +2,4 @@
     router = r2, transport = t1
   x@domain1
     router = pr1, transport = t1
  -x@domain2 is undeliverable:
  -  Unrouteable address
  +x@domain2 is undeliverable: Unrouteable address


  Index: 0265
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0265,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0265    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0265    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -userx@??? cannot be resolved at this time:
  -  error in filter data: filtering not enabled
  +userx@??? cannot be resolved at this time: error in filter data: filtering not enabled


  Index: 0267
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0267,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0267    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0267    9 Oct 2006 14:38:57 -0000    1.2
  @@ -2,5 +2,4 @@
     router = r3, transport = t1
   x-post@???
     router = r3, transport = t1
  -pre-z@??? is undeliverable:
  -  Unrouteable address
  +pre-z@??? is undeliverable: Unrouteable address


  Index: 0268
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0268,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0268    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0268    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,22 +1,11 @@
  -CALLER@r1 cannot be resolved at this time:
  -  bad owner for TESTSUITE/test-owned-by-exim
  -CALLER@r2 is undeliverable:
  -  Explictly Rejected
  -CALLER@r3 cannot be resolved at this time:
  -  bad owner for TESTSUITE/test-owned-by-exim
  -CALLER@r4 is undeliverable:
  -  Explictly Rejected
  -CALLER@r5 is undeliverable:
  -  Explictly Rejected
  -CALLER@r6 cannot be resolved at this time:
  -  bad group for TESTSUITE/test-owned-by-exim
  -CALLER@r7 is undeliverable:
  -  Explictly Rejected
  -CALLER@r8 is undeliverable:
  -  Explictly Rejected
  -CALLER@r9 is undeliverable:
  -  Explictly Rejected
  -CALLER@r10 cannot be resolved at this time:
  -  bad group for TESTSUITE/test-owned-by-exim
  -CALLER@r11 cannot be resolved at this time:
  -  bad mode (0100644) for TESTSUITE/test-owned-by-exim: 04 bit(s) unexpected
  +CALLER@r1 cannot be resolved at this time: bad owner for TESTSUITE/test-owned-by-exim
  +CALLER@r2 is undeliverable: Explictly Rejected
  +CALLER@r3 cannot be resolved at this time: bad owner for TESTSUITE/test-owned-by-exim
  +CALLER@r4 is undeliverable: Explictly Rejected
  +CALLER@r5 is undeliverable: Explictly Rejected
  +CALLER@r6 cannot be resolved at this time: bad group for TESTSUITE/test-owned-by-exim
  +CALLER@r7 is undeliverable: Explictly Rejected
  +CALLER@r8 is undeliverable: Explictly Rejected
  +CALLER@r9 is undeliverable: Explictly Rejected
  +CALLER@r10 cannot be resolved at this time: bad group for TESTSUITE/test-owned-by-exim
  +CALLER@r11 cannot be resolved at this time: bad mode (0100644) for TESTSUITE/test-owned-by-exim: 04 bit(s) unexpected


  Index: 0269
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0269,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0269    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0269    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -userx@??? cannot be resolved at this time:
  -  error in filter data: filtering not enabled
  +userx@??? cannot be resolved at this time: error in filter data: filtering not enabled


  Index: 0271
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0271,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0271    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0271    9 Oct 2006 14:38:57 -0000    1.2
  @@ -2,5 +2,4 @@
     router = r3, transport = t1
   x-post@???
     router = r3, transport = t1
  -pre-z@??? is undeliverable:
  -  Unrouteable address
  +pre-z@??? is undeliverable: Unrouteable address


  Index: 0272
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0272,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0272    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0272    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,22 +1,11 @@
  -CALLER@r1 cannot be resolved at this time:
  -  bad owner for TESTSUITE/aux-var/0272.exim
  -CALLER@r2 is undeliverable:
  -  Explictly Rejected
  -CALLER@r3 cannot be resolved at this time:
  -  bad owner for TESTSUITE/aux-var/0272.exim
  -CALLER@r4 is undeliverable:
  -  Explictly Rejected
  -CALLER@r5 is undeliverable:
  -  Explictly Rejected
  -CALLER@r6 cannot be resolved at this time:
  -  bad group for TESTSUITE/aux-var/0272.exim
  -CALLER@r7 is undeliverable:
  -  Explictly Rejected
  -CALLER@r8 is undeliverable:
  -  Explictly Rejected
  -CALLER@r9 is undeliverable:
  -  Explictly Rejected
  -CALLER@r10 cannot be resolved at this time:
  -  bad group for TESTSUITE/aux-var/0272.exim
  -CALLER@r11 cannot be resolved at this time:
  -  bad mode (0100644) for TESTSUITE/aux-var/0272.exim: 04 bit(s) unexpected
  +CALLER@r1 cannot be resolved at this time: bad owner for TESTSUITE/aux-var/0272.exim
  +CALLER@r2 is undeliverable: Explictly Rejected
  +CALLER@r3 cannot be resolved at this time: bad owner for TESTSUITE/aux-var/0272.exim
  +CALLER@r4 is undeliverable: Explictly Rejected
  +CALLER@r5 is undeliverable: Explictly Rejected
  +CALLER@r6 cannot be resolved at this time: bad group for TESTSUITE/aux-var/0272.exim
  +CALLER@r7 is undeliverable: Explictly Rejected
  +CALLER@r8 is undeliverable: Explictly Rejected
  +CALLER@r9 is undeliverable: Explictly Rejected
  +CALLER@r10 cannot be resolved at this time: bad group for TESTSUITE/aux-var/0272.exim
  +CALLER@r11 cannot be resolved at this time: bad mode (0100644) for TESTSUITE/aux-var/0272.exim: 04 bit(s) unexpected


  Index: 0273
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0273,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0273    16 Mar 2006 14:23:36 -0000    1.2
  +++ 0273    9 Oct 2006 14:38:57 -0000    1.3
  @@ -2,18 +2,13 @@
     router = r1, transport = t1
   userx@r2
     router = r2, transport = t1
  -userx@r3 cannot be resolved at this time:
  -  require_files: error for TESTSUITE/aux-var/0273.exim: Permission denied
  -userx@r4 cannot be resolved at this time:
  -  user "non-existant" for require_files not found
  -userx@r5 cannot be resolved at this time:
  -  group missing after numerical uid 1 for require_files
  +userx@r3 cannot be resolved at this time: require_files: error for TESTSUITE/aux-var/0273.exim: Permission denied
  +userx@r4 cannot be resolved at this time: user "non-existant" for require_files not found
  +userx@r5 cannot be resolved at this time: group missing after numerical uid 1 for require_files
   userx@r6
     router = r6, transport = t1
  -userx@r7 is undeliverable:
  -  Unrouteable address
  -userx@r8 is undeliverable:
  -  Unrouteable address
  +userx@r7 is undeliverable: Unrouteable address
  +userx@r8 is undeliverable: Unrouteable address
   220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   250 <userx@r1> is deliverable
   250 <userx@r2> is deliverable


  Index: 0278
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0278,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0278    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0278    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,4 +1,3 @@
   CALLER@???
     router = r3, transport = t1
  -unknown@??? is undeliverable:
  -  Unrouteable address
  +unknown@??? is undeliverable: Unrouteable address


  Index: 0279
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0279,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0279    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0279    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,4 +1,3 @@
   CALLER@???
     router = r3, transport = t1
  -CALLER@??? is undeliverable:
  -  matched *@+funny_domains
  +CALLER@??? is undeliverable: matched *@+funny_domains


  Index: 0305
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0305,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0305    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0305    9 Oct 2006 14:38:57 -0000    1.2
  @@ -9,5 +9,4 @@
   550 Administrative prohibition
   221 myhost.test.ex closing connection
   x@??? verified
  -x@??? failed to verify:
  -  Unrouteable address
  +x@??? failed to verify: Unrouteable address


  Index: 0334
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0334,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0334    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0334    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -x@y cannot be resolved at this time:
  -  remote host address is the local host
  +x@y cannot be resolved at this time: remote host address is the local host


  Index: 0364
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0364,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0364    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0364    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,8 +1,9 @@
   kilos@???
       <-- kilos@thishost
     router = r5, transport = t2
  -solik@otherhost is undeliverable:
  -  Can't route to otherhost.sub.test.ex
  +solik@??? is undeliverable: Can't route to otherhost.sub.test.ex
  +    <-- solik@???
  +    <-- solik@otherhost
   xxx@???
       <-- xxx@ten-1
     router = r2, transport = t1


  Index: 0399
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0399,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0399    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0399    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -x@y cannot be resolved at this time:
  -  failed to expand "more" in r3 router: unknown variable name "unknown_variable"
  +x@y cannot be resolved at this time: failed to expand "more" in r3 router: unknown variable name "unknown_variable"


  Index: 0424
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0424,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0424    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0424    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -userx@??? is undeliverable:
  -  Return_path is: <CALLER@???>
  +userx@??? is undeliverable: Return_path is: <CALLER@???>


  Index: 0430
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0430,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 0430    16 Feb 2006 10:05:34 -0000    1.3
  +++ 0430    9 Oct 2006 14:38:57 -0000    1.4
  @@ -43,17 +43,14 @@
   x@???
     router = r1, transport = t1
     host ten-1.test.ex [V4NET.0.0.1] 
  -x@??? cannot be resolved at this time:
  -  lowest numbered MX record points to local host
  +x@??? cannot be resolved at this time: lowest numbered MX record points to local host
   x@???
     router = r1, transport = t1
     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@??? is undeliverable:
  -  lowest numbered MX record points to local host
  -x@??? cannot be resolved at this time:
  -  lookup of host "localhost.test.ex" failed in r2 router
  +x@??? is undeliverable: lowest numbered MX record points to local host
  +x@??? cannot be resolved at this time: lookup of host "localhost.test.ex" failed in r2 router
   x@???
     router = r2, transport = t1
     host ten-6.test.ex [V4NET.0.0.6] 


  Index: 0434
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0434,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0434    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0434    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,5 +1,4 @@
   a@b
     router = r1, transport = t1
     host 1.2.3.4 [1.2.3.4] 
  -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


  Index: 0467
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0467,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 0467    17 Mar 2006 16:51:46 -0000    1.3
  +++ 0467    9 Oct 2006 14:38:57 -0000    1.4
  @@ -1,5 +1,4 @@
  -x@??? is undeliverable:
  -  Unrouteable address
  +x@??? is undeliverable: Unrouteable address
   x@???
     router = r1, transport = t1
     host ten-1.test.ex [V4NET.0.0.1] MX=0 port=25
  @@ -12,10 +11,8 @@
     host ten-1.test.ex [V4NET.0.0.1] MX=1 port=99
     host ten-2.test.ex [V4NET.0.0.2] MX=1 port=99
     host ten-3.test.ex [V4NET.0.0.3] MX=3 port=66
  -x@??? is undeliverable:
  -  an MX or SRV record indicated no SMTP service
  -x@??? is undeliverable:
  -  Unrouteable address
  +x@??? is undeliverable: an MX or SRV record indicated no SMTP service
  +x@??? is undeliverable: Unrouteable address
   x@???
     router = r1, transport = t1
     host ten-4.test.ex [V4NET.0.0.4] MX=0 port=88


  Index: 0469
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0469,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0469    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0469    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -x@??? is undeliverable:
  -  all relevant MX records point to non-existent hosts
  +x@??? is undeliverable: all relevant MX records point to non-existent hosts


  Index: 1005
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/1005,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 1005    7 Feb 2006 10:47:37 -0000    1.1
  +++ 1005    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -userx@??? cannot be resolved at this time:
  -  lookup of host "eximtesthost.ipv6.test.ex" failed in lookuphost router
  +userx@??? cannot be resolved at this time: lookup of host "eximtesthost.ipv6.test.ex" failed in lookuphost router


  Index: 1006
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/1006,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 1006    16 Feb 2006 10:05:34 -0000    1.2
  +++ 1006    9 Oct 2006 14:38:57 -0000    1.3
  @@ -15,8 +15,7 @@
   manualroute@???
     router = r2, transport = smtp
     host 46.test.ex [V4NET.0.0.4] 
  -dnslookup@??? is undeliverable:
  -  Unrouteable address
  +dnslookup@??? 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


  Index: 2201
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/2201,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 2201    7 Feb 2006 10:47:37 -0000    1.1
  +++ 2201    9 Oct 2006 14:38:57 -0000    1.2
  @@ -4,5 +4,4 @@
     router = r2, transport = local_delivery
   test.ex@???
     router = r1, transport = local_delivery
  -unknown@??? is undeliverable:
  -  Unrouteable address
  +unknown@??? is undeliverable: Unrouteable address


  Index: 2501
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/2501,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 2501    7 Feb 2006 10:47:37 -0000    1.1
  +++ 2501    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,5 +1,4 @@
   xxx@okdomain
     router = r1, transport = t1
  -yyy@notokdomain is undeliverable:
  -  Unrouteable address
  +yyy@notokdomain is undeliverable: Unrouteable address
   syntax error: malformed address: /mod may not follow zzz@dom


  Index: 3206
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/3206,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3206    7 Feb 2006 10:47:37 -0000    1.1
  +++ 3206    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,3 +1,2 @@
   a@??? verified
  -b@??? cannot be resolved at this time:
  -  domains check lookup or other defer
  +b@??? cannot be resolved at this time: domains check lookup or other defer


  Index: 3210
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/3210,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3210    7 Feb 2006 10:47:37 -0000    1.1
  +++ 3210    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -userx@??? cannot be resolved at this time:
  -  domains check lookup or other defer
  +userx@??? cannot be resolved at this time: domains check lookup or other defer


  Index: 4950
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/4950,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 4950    7 Feb 2006 10:47:37 -0000    1.1
  +++ 4950    9 Oct 2006 14:38:57 -0000    1.2
  @@ -11,8 +11,7 @@
   userx@???
     router = lookuphost, transport = smtp
     host other1.test.ex [V4NET.12.4.5] 
  -userx@??? cannot be resolved at this time:
  -  host non-exist.test.ex not found when translating other99.test.ex [V4NET.99.0.1]
  +userx@??? cannot be resolved at this time: host non-exist.test.ex not found when translating other99.test.ex [V4NET.99.0.1]
   userx@???
     router = lookuphost, transport = smtp
     host non-exist.test.ex [unknown] 


  Index: 5204
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/5204,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 5204    7 Feb 2006 14:05:17 -0000    1.2
  +++ 5204    9 Oct 2006 14:38:57 -0000    1.3
  @@ -1,21 +1,15 @@
  -"ACCEPT hosts=localhost lookup=byname"@??? cannot be resolved at this time:
  -  remote host address is the local host
  -"DECLINE cannot route this one (DECLINE)"@??? is undeliverable:
  -  Unrouteable address
  -"FAIL cannot route this one (FAIL)"@??? is undeliverable:
  -  cannot route this one (FAIL)
  -"ERROR cannot route this one (ERROR)"@??? cannot be resolved at this time:
  -  bad command yield: ERROR cannot route this one (ERROR)
  -"DEFER cannot route this one (DEFER)"@??? cannot be resolved at this time:
  -  cannot route this one (DEFER)
  +"ACCEPT hosts=localhost lookup=byname"@??? cannot be resolved at this time: remote host address is the local host
  +"DECLINE cannot route this one (DECLINE)"@??? is undeliverable: Unrouteable address
  +"FAIL cannot route this one (FAIL)"@??? is undeliverable: cannot route this one (FAIL)
  +"ERROR cannot route this one (ERROR)"@??? cannot be resolved at this time: bad command yield: ERROR cannot route this one (ERROR)
  +"DEFER cannot route this one (DEFER)"@??? cannot be resolved at this time: cannot route this one (DEFER)
   "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@???
     router = q, transport = other_smtp
     host ten-1.test.ex [V4NET.0.0.1] 
   PASS@???
     router = s, transport = smtp
     host 127.0.0.1 [127.0.0.1] 
  -"FREEZE cannot route this one (FREEZE)"@??? cannot be resolved at this time:
  -  cannot route this one (FREEZE)
  +"FREEZE cannot route this one (FREEZE)"@??? cannot be resolved at this time: cannot route this one (FREEZE)
   postmaster@???
       <-- "REDIRECT postmaster@???
     router = pm, transport = null


  Index: 5205
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/5205,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 5205    7 Feb 2006 10:47:37 -0000    1.1
  +++ 5205    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -userx@??? cannot be resolved at this time:
  -  lookup of host "ten-3.test.ex" failed in queryprogram router
  +userx@??? cannot be resolved at this time: lookup of host "ten-3.test.ex" failed in queryprogram router


  Index: 5206
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/5206,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 5206    7 Feb 2006 10:47:37 -0000    1.1
  +++ 5206    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -userx@??? cannot be resolved at this time:
  -  lookup of host "ten-3.test.ex" failed in queryprogram router
  +userx@??? cannot be resolved at this time: lookup of host "ten-3.test.ex" failed in queryprogram router


  Index: 5209
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/5209,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 5209    7 Feb 2006 10:47:37 -0000    1.1
  +++ 5209    9 Oct 2006 14:38:57 -0000    1.2
  @@ -1,2 +1 @@
  -x@y is undeliverable:
  -  67890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C23
  +x@y is undeliverable: 67890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C23