tidying

[exim.git] / test / stderr / 0094

diff --git a/test/stderr/0094 b/test/stderr/0094
index 6310708237fce4f55cc2c222290a73dc87e679cc..061c49b4e204879f39dddce307fdcc9af5ff68a6 100644 (file)
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -15,13 +15,13 @@ LOG: no host name found for IP address V4NET.11.12.13
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 23)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :
 >>> host in ":"?
 >>>  list element: 
 >>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 24)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 24)
 >>> check domains = +local_domains
 >>> cam.ac.uk in "+local_domains"?
 >>>  list element: +local_domains
@@ -31,35 +31,35 @@ LOG: no host name found for IP address V4NET.11.12.13
 >>>    cam.ac.uk in "test.ex"? no (end of list)
 >>>   end sublist local_domains
 >>> cam.ac.uk in "+local_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 25)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts
 >>>   start sublist relay_hosts
 >>>    host in "*.masq.test.ex"?
 >>>    ╎list element: *.masq.test.ex
->>> sender host name required, to match against *.masq.test.ex
+>>>    ╎sender host name required, to match against *.masq.test.ex
 >>>    ╎host in "*.masq.test.ex"? no (failed to find host name for V4NET.11.12.13)
 >>>    end sublist relay_hosts
 >>>  host in "+relay_hosts"? no (end of list)
->>>  accept: condition test failed in ACL "check_recipient"
->>>  processing "deny" (TESTSUITE/test-config 26)
+>>>  accept: condition test failed in ACL check_recipient
+>>>  processing ACL check_recipient "deny" (TESTSUITE/test-config 26)
 >>>    message: relay not permitted
->>>  deny: condition test succeeded in ACL "check_recipient"
->>>  end of ACL "check_recipient": DENY
+>>>  deny: condition test succeeded in ACL check_recipient
+>>>  end of ACL check_recipient: DENY
 LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup?
 >>>  list element: 0.0.0.0/0
 >>>  host in host_lookup? yes (matched "0.0.0.0/0")
 >>> looking up host name for V4NET.0.0.1
->>> IP address lookup yielded "ten-1.test.ex"
+>>>  IP address lookup yielded "ten-1.test.ex"
 >>>  check dnssec require list
 >>>   ten-1.test.ex not in empty list (option unset? cannot trace name)
 >>>  check dnssec request list
 >>>   ten-1.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-1.test.ex
+>>>  checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
@@ -68,13 +68,13 @@ LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.u
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 23)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :
 >>> host in ":"?
 >>>  list element: 
 >>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 24)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 24)
 >>> check domains = +local_domains
 >>> cam.ac.uk in "+local_domains"?
 >>>  list element: +local_domains
@@ -84,8 +84,8 @@ LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.u
 >>>    cam.ac.uk in "test.ex"? no (end of list)
 >>>   end sublist local_domains
 >>> cam.ac.uk in "+local_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 25)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts
@@ -95,13 +95,14 @@ LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.u
 >>>    host in "*.masq.test.ex"? no (end of list)
 >>>   end sublist relay_hosts
 >>> host in "+relay_hosts"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 26)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "deny" (TESTSUITE/test-config 26)
 >>>   message: relay not permitted
->>> deny: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": DENY
+>>> deny: condition test succeeded in ACL check_recipient
+>>> end of ACL check_recipient: DENY
 LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
@@ -123,8 +124,9 @@ host in host_lookup?
 looking up host name for V4NET.99.99.90
  DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) using fakens
  DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) succeeded
-IP address lookup yielded "oneback.test.ex"
-  alias "host1.masq.test.ex"
+ Reverse DNS security status: unverified
+ IP address lookup yielded "oneback.test.ex"
+   alias "host1.masq.test.ex"
  check dnssec require list
   oneback.test.ex not in empty list (option unset? cannot trace name)
  check dnssec request list
@@ -132,8 +134,8 @@ IP address lookup yielded "oneback.test.ex"
  DNS lookup of oneback.test.ex (A) using fakens
  DNS lookup of oneback.test.ex (A) succeeded
  oneback.test.ex V4NET.99.99.90 mx=-1 sort=xx 
-checking addresses for oneback.test.ex
-Forward DNS security status: unverified
+ checking addresses for oneback.test.ex
+ Forward DNS security status: unverified
   V4NET.99.99.90 OK
  check dnssec require list
   host1.masq.test.ex not in empty list (option unset? cannot trace name)
@@ -142,8 +144,8 @@ Forward DNS security status: unverified
  DNS lookup of host1.masq.test.ex (A) using fakens
  DNS lookup of host1.masq.test.ex (A) succeeded
  host1.masq.test.ex V4NET.90.90.90 mx=-1 sort=xx 
-checking addresses for host1.masq.test.ex
-Forward DNS security status: unverified
+ checking addresses for host1.masq.test.ex
+ Forward DNS security status: unverified
   V4NET.90.90.90
 no IP address for host1.masq.test.ex matched V4NET.99.99.90
 sender_fullhost = oneback.test.ex [V4NET.99.99.90]
@@ -168,13 +170,13 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<userx@test.ex>
 using ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 23)
+processing ACL check_recipient "accept" (TESTSUITE/test-config 23)
 check hosts = :
 host in ":"?
  list element: 
 host in ":"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 24)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "accept" (TESTSUITE/test-config 24)
 check domains = +local_domains
 test.ex in "+local_domains"?
  list element: +local_domains
@@ -185,18 +187,18 @@ test.ex in "+local_domains"?
   end sublist local_domains
  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
  test.ex in "+local_domains"? yes (matched "+local_domains")
-accept: condition test succeeded in ACL "check_recipient"
-end of ACL "check_recipient": ACCEPT
+accept: condition test succeeded in ACL check_recipient
+end of ACL check_recipient: ACCEPT
 SMTP>> 250 Accepted
 SMTP<< rcpt to:<userx@cam.ac.uk>
 using ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 23)
+processing ACL check_recipient "accept" (TESTSUITE/test-config 23)
 check hosts = :
 host in ":"?
  list element: 
 host in ":"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 24)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "accept" (TESTSUITE/test-config 24)
 check domains = +local_domains
 cam.ac.uk in "+local_domains"?
  list element: +local_domains
@@ -206,8 +208,8 @@ cam.ac.uk in "+local_domains"?
    cam.ac.uk in "test.ex"? no (end of list)
   end sublist local_domains
 cam.ac.uk in "+local_domains"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "accept" (TESTSUITE/test-config 25)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "accept" (TESTSUITE/test-config 25)
 check hosts = +relay_hosts
 host in "+relay_hosts"?
  list element: +relay_hosts
@@ -217,11 +219,11 @@ host in "+relay_hosts"?
   host in "*.masq.test.ex"? no (end of list)
   end sublist relay_hosts
 host in "+relay_hosts"? no (end of list)
-accept: condition test failed in ACL "check_recipient"
-processing "deny" (TESTSUITE/test-config 26)
+accept: condition test failed in ACL check_recipient
+processing ACL check_recipient "deny" (TESTSUITE/test-config 26)
   message: relay not permitted
-deny: condition test succeeded in ACL "check_recipient"
-end of ACL "check_recipient": DENY
+deny: condition test succeeded in ACL check_recipient
+end of ACL check_recipient: DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
   H=oneback.test.ex (test) [V4NET.99.99.90] F=<userx@test.ex> rejected RCPT <userx@cam.ac.uk>: relay not permitted