ACL: reword error message for ratelimit. Bug 2267

[users/jgh/exim.git] / test / stderr / 0094

diff --git a/test/stderr/0094 b/test/stderr/0094
index 8626c5ec1fcee4124f81825aef176a6fda46f73c..f612ed36ff9a09b936bb2748db5b7dae85937f9e 100644 (file)
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -32,10 +32,7 @@ LOG: H=[V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: rel
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? yes (matched "0.0.0.0/0")
 >>> looking up host name for V4NET.0.0.1
 >>> host in hosts_connection_nolog? no (option unset)
 >>> 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
-MUNGED: ::1 will be omitted in what follows
->>> get[host|ipnode]byname[2] looked up these IP addresses:
->>>   name=ten-1.test.ex address=V4NET.0.0.1
+>>> IP address lookup yielded "ten-1.test.ex"

 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> host in host_reject_connection? no (option unset)
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> host in host_reject_connection? no (option unset)


@@ -84,23 +81,19 @@ host in host_lookup? yes (matched "0.0.0.0/0")
 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
 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
-using host_fake_gethostbyname for oneback.test.ex (IPv4)
+IP address lookup yielded "oneback.test.ex"
+  alias "host1.masq.test.ex"

 DNS lookup of oneback.test.ex (A) using fakens
 DNS lookup of oneback.test.ex (A) succeeded
 DNS lookup of oneback.test.ex (A) using fakens
 DNS lookup of oneback.test.ex (A) succeeded

-MUNGED: ::1 will be omitted in what follows
-get[host|ipnode]byname[2] looked up these IP addresses:
-  name=oneback.test.ex address=V4NET.99.99.90
+oneback.test.ex V4NET.99.99.90 mx=-1 sort=xx 

 checking addresses for oneback.test.ex
 checking addresses for oneback.test.ex

+Forward DNS security status: unverified

   V4NET.99.99.90 OK
   V4NET.99.99.90 OK

-using host_fake_gethostbyname for host1.masq.test.ex (IPv4)

 DNS lookup of host1.masq.test.ex (A) using fakens
 DNS lookup of host1.masq.test.ex (A) succeeded
 DNS lookup of host1.masq.test.ex (A) using fakens
 DNS lookup of host1.masq.test.ex (A) succeeded

-MUNGED: ::1 will be omitted in what follows
-get[host|ipnode]byname[2] looked up these IP addresses:
-  name=host1.masq.test.ex address=V4NET.90.90.90
+host1.masq.test.ex V4NET.90.90.90 mx=-1 sort=xx 

 checking addresses for host1.masq.test.ex
 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]
   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]


@@ -115,6 +108,8 @@ host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<userx@test.ex>
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<userx@test.ex>

+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

 SMTP>> 250 OK
 SMTP<< rcpt to:<userx@test.ex>
 using ACL "check_recipient"
 SMTP>> 250 OK
 SMTP<< rcpt to:<userx@test.ex>
 using ACL "check_recipient"


@@ -129,6 +124,7 @@ test.ex in "+local_domains"? yes (matched "+local_domains")
 accept: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": ACCEPT
 SMTP>> 250 Accepted

+DSN: orcpt: NULL  flags: 0

 SMTP<< rcpt to:<userx@cam.ac.uk>
 using ACL "check_recipient"
 processing "accept"
 SMTP<< rcpt to:<userx@cam.ac.uk>
 using ACL "check_recipient"
 processing "accept"


@@ -157,4 +153,4 @@ SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
   SMTP connection from oneback.test.ex [V4NET.99.99.90] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from oneback.test.ex [V4NET.99.99.90] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>