Call notquite ACL for synprot-error limit. Bug 3092

[exim.git] / test / stderr / 0022

diff --git a/test/stderr/0022 b/test/stderr/0022
index c647f7326489bd5e1b3d4d1df65fb957cc4ce7ae..495b2c1110cec8c70d87d05434d7722797c06586 100644 (file)
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -1,16 +1,20 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
 changed uid/gid: forcing real = effective

-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1236

 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed

-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1236

 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7]
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7]

+host in hosts_connection_nolog?
+ list element: 
+ list element: 127.0.0.1

 host in hosts_connection_nolog? no (end of list)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.9.8.7]
 host in hosts_connection_nolog? no (end of list)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.9.8.7]


@@ -25,6 +29,9 @@ host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test

+test in helo_lookup_domains?
+ list element: @
+ list element: @[]

 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7] (helo=test)
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7] (helo=test)


@@ -36,52 +43,60 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<warn_empty@test.ex>
 using ACL "warn_empty"
 SMTP>> 250 OK
 SMTP<< rcpt to:<warn_empty@test.ex>
 using ACL "warn_empty"

-processing "warn" (TESTSUITE/test-config 29)
-warn: condition test succeeded in ACL "warn_empty"
-processing "accept" (TESTSUITE/test-config 30)
-accept: condition test succeeded in ACL "warn_empty"
-end of ACL "warn_empty": ACCEPT
+processing ACL warn_empty "warn" (TESTSUITE/test-config 31)
+warn: condition test succeeded in ACL warn_empty
+processing ACL warn_empty "accept" (TESTSUITE/test-config 32)
+accept: condition test succeeded in ACL warn_empty
+end of ACL warn_empty: ACCEPT

 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 
 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 

+qualify & rewrite recipients list
+rewrite rules on sender address
+qualify and rewrite headers

 search_tidyup called
 >>Headers after rewriting and local additions:
 
 search_tidyup called
 >>Headers after rewriting and local additions:
 

-Data file name: TESTSUITE/spool//input//10HmbF-0005vi-00-D
-Data file written for message 10HmbF-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmbF-000000005vi-0000-D
+Data file written for message 10HmbF-000000005vi-0000

 >>Generated Received: header line
 P Received: from [V4NET.9.8.7] (helo=test)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
 >>Generated Received: header line
 P Received: from [V4NET.9.8.7] (helo=test)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)

-       id 10HmbF-0005vi-00
+       id 10HmbF-000000005vi-0000

        for warn_empty@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss
        for warn_empty@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss

-SMTP>> 250 OK id=10HmbF-0005vi-00
+receive_msg: tidyup
+SMTP>> 250 OK id=10HmbF-000000005vi-0000

 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
+  SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT

 search_tidyup called
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
 changed uid/gid: forcing real = effective

-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1237

 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed

-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1237

 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7]
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7]

+host in hosts_connection_nolog?
+ list element: 
+ list element: 127.0.0.1

 host in hosts_connection_nolog? no (end of list)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.9.8.7]
 host in hosts_connection_nolog? no (end of list)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.9.8.7]


@@ -96,6 +111,9 @@ host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test

+test in helo_lookup_domains?
+ list element: @
+ list element: @[]

 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7] (helo=test)
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7] (helo=test)


@@ -107,55 +125,63 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<warn_log@test.ex>
 using ACL "warn_log"
 SMTP>> 250 OK
 SMTP<< rcpt to:<warn_log@test.ex>
 using ACL "warn_log"

-processing "warn" (TESTSUITE/test-config 33)
+processing ACL warn_log "warn" (TESTSUITE/test-config 35)

 l_message: warn log message
 l_message: warn log message

-warn: condition test succeeded in ACL "warn_log"
+warn: condition test succeeded in ACL warn_log

 LOG: MAIN
   H=(test) [V4NET.9.8.7] Warning: warn log message
 LOG: MAIN
   H=(test) [V4NET.9.8.7] Warning: warn log message

-processing "accept" (TESTSUITE/test-config 34)
-accept: condition test succeeded in ACL "warn_log"
-end of ACL "warn_log": ACCEPT
+processing ACL warn_log "accept" (TESTSUITE/test-config 36)
+accept: condition test succeeded in ACL warn_log
+end of ACL warn_log: ACCEPT

 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 
 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 

+qualify & rewrite recipients list
+rewrite rules on sender address
+qualify and rewrite headers

 search_tidyup called
 >>Headers after rewriting and local additions:
 
 search_tidyup called
 >>Headers after rewriting and local additions:
 

-Data file name: TESTSUITE/spool//input//10HmbG-0005vi-00-D
-Data file written for message 10HmbG-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmbG-000000005vi-0000-D
+Data file written for message 10HmbG-000000005vi-0000

 >>Generated Received: header line
 P Received: from [V4NET.9.8.7] (helo=test)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
 >>Generated Received: header line
 P Received: from [V4NET.9.8.7] (helo=test)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)

-       id 10HmbG-0005vi-00
+       id 10HmbG-000000005vi-0000

        for warn_log@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss
        for warn_log@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss

-SMTP>> 250 OK id=10HmbG-0005vi-00
+receive_msg: tidyup
+SMTP>> 250 OK id=10HmbG-000000005vi-0000

 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
+  SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT

 search_tidyup called
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
 changed uid/gid: forcing real = effective

-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1238

 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed

-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1238

 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7]
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7]

+host in hosts_connection_nolog?
+ list element: 
+ list element: 127.0.0.1

 host in hosts_connection_nolog? no (end of list)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.9.8.7]
 host in hosts_connection_nolog? no (end of list)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.9.8.7]


@@ -170,6 +196,9 @@ host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test

+test in helo_lookup_domains?
+ list element: @
+ list element: @[]

 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7] (helo=test)
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7] (helo=test)


@@ -181,28 +210,31 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<warn_user@test.ex>
 using ACL "warn_user"
 SMTP>> 250 OK
 SMTP<< rcpt to:<warn_user@test.ex>
 using ACL "warn_user"

-processing "warn" (TESTSUITE/test-config 37)
+processing ACL warn_user "warn" (TESTSUITE/test-config 39)

   message: warn user message
   message: warn user message

-warn: condition test succeeded in ACL "warn_user"
-processing "accept" (TESTSUITE/test-config 38)
-accept: condition test succeeded in ACL "warn_user"
-end of ACL "warn_user": ACCEPT
+warn: condition test succeeded in ACL warn_user
+processing ACL warn_user "accept" (TESTSUITE/test-config 40)
+accept: condition test succeeded in ACL warn_user
+end of ACL warn_user: ACCEPT

 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 
 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 

+qualify & rewrite recipients list
+rewrite rules on sender address
+qualify and rewrite headers

 search_tidyup called
 >>Headers after rewriting and local additions:
 
 search_tidyup called
 >>Headers after rewriting and local additions:
 

-Data file name: TESTSUITE/spool//input//10HmbH-0005vi-00-D
-Data file written for message 10HmbH-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmbH-000000005vi-0000-D
+Data file written for message 10HmbH-000000005vi-0000

 >>Generated Received: header line
 P Received: from [V4NET.9.8.7] (helo=test)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
 >>Generated Received: header line
 P Received: from [V4NET.9.8.7] (helo=test)
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)

-       id 10HmbH-0005vi-00
+       id 10HmbH-000000005vi-0000

        for warn_user@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 >>Headers added by MAIL or RCPT ACL:
        for warn_user@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 >>Headers added by MAIL or RCPT ACL:


@@ -210,14 +242,18 @@ P Received: from [V4NET.9.8.7] (helo=test)
 >>
 LOG: MAIN
   <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss
 >>
 LOG: MAIN
   <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss

-SMTP>> 250 OK id=10HmbH-0005vi-00
+receive_msg: tidyup
+SMTP>> 250 OK id=10HmbH-000000005vi-0000

 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
+  SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT

 search_tidyup called
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>> host in hosts_connection_nolog?
+>>>  list element: 
+>>>  list element: 127.0.0.1

 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)
 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)


@@ -227,24 +263,30 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]

 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "defer"
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "defer"

->>> processing "defer" (TESTSUITE/test-config 51)
+>>> processing ACL defer "defer" (TESTSUITE/test-config 53)

 >>>   message: forcibly deferred
 >>>   message: forcibly deferred

->>> defer: condition test succeeded in ACL "defer"
->>> end of ACL "defer": DEFER
+>>> defer: condition test succeeded in ACL defer
+>>> end of ACL defer: DEFER

 LOG: H=(test) [V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly deferred
 >>> using ACL "accept"
 LOG: H=(test) [V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly deferred
 >>> using ACL "accept"

->>> processing "accept" (TESTSUITE/test-config 24)
->>> accept: condition test succeeded in ACL "accept"
->>> end of ACL "accept": ACCEPT
+>>> processing ACL accept "accept" (TESTSUITE/test-config 26)
+>>> accept: condition test succeeded in ACL accept
+>>> end of ACL accept: ACCEPT

 >>> using ACL "drop"
 >>> using ACL "drop"

->>> processing "drop" (TESTSUITE/test-config 41)
+>>> processing ACL drop "drop" (TESTSUITE/test-config 43)

 >>>   message: forcibly dropped
 >>>   message: forcibly dropped

->>> drop: condition test succeeded in ACL "drop"
->>> end of ACL "drop": DROP
+>>> drop: condition test succeeded in ACL drop
+>>> end of ACL drop: DROP

 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <drop@y>: forcibly dropped
 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <drop@y>: forcibly dropped

-LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL
+LOG: SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by DROP in ACL
+>>> host in hosts_connection_nolog?
+>>>  list element: 
+>>>  list element: 127.0.0.1

 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)
 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)


@@ -254,15 +296,23 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]

 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "defer_senders"
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "defer_senders"

->>> processing "defer" (TESTSUITE/test-config 54)
+>>> processing ACL defer_senders "defer" (TESTSUITE/test-config 56)

 >>> check senders = :
 >>> check senders = :

->>>  in ":"? yes (matched "")
->>> defer: condition test succeeded in ACL "defer_senders"
->>> end of ACL "defer_senders": DEFER
+>>>  in ":"?
+>>>  list element: 
+>>>   in ":"? yes (matched "")
+>>> defer: condition test succeeded in ACL defer_senders
+>>> end of ACL defer_senders: DEFER

 LOG: H=(test) [V4NET.9.8.7] F=<> temporarily rejected RCPT <defer_senders@y>
 LOG: H=(test) [V4NET.9.8.7] F=<> temporarily rejected RCPT <defer_senders@y>

-LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
+LOG: SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT
+>>> host in hosts_connection_nolog?
+>>>  list element: 
+>>>  list element: 127.0.0.1

 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)
 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)


@@ -272,24 +322,30 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]

 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "delay_accept"
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "delay_accept"

->>> processing "accept" (TESTSUITE/test-config 57)
+>>> processing ACL delay_accept "accept" (TESTSUITE/test-config 59)

 >>> check delay = 1s
 >>> delay modifier requests 1-second delay
 >>> delay skipped in -bh checking mode
 >>> check delay = 1s
 >>> delay modifier requests 1-second delay
 >>> delay skipped in -bh checking mode

->>> accept: condition test succeeded in ACL "delay_accept"
->>> end of ACL "delay_accept": ACCEPT
+>>> accept: condition test succeeded in ACL delay_accept
+>>> end of ACL delay_accept: ACCEPT

 >>> using ACL "delay_warn"
 >>> using ACL "delay_warn"

->>> processing "warn" (TESTSUITE/test-config 60)
+>>> processing ACL delay_warn "warn" (TESTSUITE/test-config 62)

 >>> check delay = 1s
 >>> delay modifier requests 1-second delay
 >>> delay skipped in -bh checking mode
 >>> check delay = 1s
 >>> delay modifier requests 1-second delay
 >>> delay skipped in -bh checking mode

->>> warn: condition test succeeded in ACL "delay_warn"
->>> processing "accept" (TESTSUITE/test-config 61)
->>> accept: condition test succeeded in ACL "delay_warn"
->>> end of ACL "delay_warn": ACCEPT
-LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
+>>> warn: condition test succeeded in ACL delay_warn
+>>> processing ACL delay_warn "accept" (TESTSUITE/test-config 63)
+>>> accept: condition test succeeded in ACL delay_warn
+>>> end of ACL delay_warn: ACCEPT
+LOG: SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT
+>>> host in hosts_connection_nolog?
+>>>  list element: 
+>>>  list element: 127.0.0.1

 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)
 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)


@@ -299,41 +355,60 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]

 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "host_check"
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "host_check"

->>> processing "deny" (TESTSUITE/test-config 71)
+>>> processing ACL host_check "deny" (TESTSUITE/test-config 73)

 >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
 >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts

->>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
+>>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"?
+>>>  list element: net-lsearch;TESTSUITE/aux-var/0022.hosts
+>>>  host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")

 >>>   message: host data >$host_data<
 >>>   message: host data >$host_data<

->>> deny: condition test succeeded in ACL "host_check"
->>> end of ACL "host_check": DENY
+>>> deny: condition test succeeded in ACL host_check
+>>> end of ACL host_check: DENY

 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
 >>> using ACL "host_check"
 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
 >>> using ACL "host_check"

->>> processing "deny" (TESTSUITE/test-config 71)
+>>> processing ACL host_check "deny" (TESTSUITE/test-config 73)

 >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
 >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts

->>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
+>>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"?
+>>>  list element: net-lsearch;TESTSUITE/aux-var/0022.hosts
+>>>  host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")

 >>>   message: host data >$host_data<
 >>>   message: host data >$host_data<

->>> deny: condition test succeeded in ACL "host_check"
->>> end of ACL "host_check": DENY
+>>> deny: condition test succeeded in ACL host_check
+>>> end of ACL host_check: DENY

 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
 >>> using ACL "host_check2"
 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
 >>> using ACL "host_check2"

->>> processing "deny" (TESTSUITE/test-config 75)
+>>> processing ACL host_check2 "deny" (TESTSUITE/test-config 77)

 >>>   message: host data >$host_data<
 >>> check hosts = +some_hosts
 >>>   message: host data >$host_data<
 >>> check hosts = +some_hosts

->>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
->>> host in "+some_hosts"? yes (matched "+some_hosts")
->>> deny: condition test succeeded in ACL "host_check2"
->>> end of ACL "host_check2": DENY
+>>> host in "+some_hosts"?
+>>>  list element: +some_hosts
+>>>   start sublist some_hosts
+>>>    host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"?
+>>>    ╎list element: net-lsearch;TESTSUITE/aux-var/0022.hosts
+>>>    ╎host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
+>>>   end sublist some_hosts
+>>>  data from lookup saved for cache for +some_hosts: key 'V4NET.9.8.7' value 'A host-specific message'
+>>>  host in "+some_hosts"? yes (matched "+some_hosts")
+>>> deny: condition test succeeded in ACL host_check2
+>>> end of ACL host_check2: DENY

 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
 >>> using ACL "host_check2"
 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
 >>> using ACL "host_check2"

->>> processing "deny" (TESTSUITE/test-config 75)
+>>> processing ACL host_check2 "deny" (TESTSUITE/test-config 77)

 >>>   message: host data >$host_data<
 >>> check hosts = +some_hosts
 >>>   message: host data >$host_data<
 >>> check hosts = +some_hosts

->>> host in "+some_hosts"? yes (matched "+some_hosts" - cached)
->>> deny: condition test succeeded in ACL "host_check2"
->>> end of ACL "host_check2": DENY
+>>> host in "+some_hosts"?
+>>>  list element: +some_hosts
+>>>   start sublist some_hosts
+>>>  cached yes match for +some_hosts
+>>>  cached lookup data = A host-specific message
+>>>  host in "+some_hosts"? yes (matched "+some_hosts" - cached)
+>>> deny: condition test succeeded in ACL host_check2
+>>> end of ACL host_check2: DENY

 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<

-LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT
+LOG: SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT

 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN


@@ -344,7 +419,7 @@ LOG: MAIN
   frozen by ACL
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local-smtp S=sss
   frozen by ACL
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local-smtp S=sss

-delivering 10HmaY-0005vi-00
+delivering 10HmaY-000000005vi-0000

 LOG: MAIN
   *> accept <accept@y> R=accept T=appendfile
 LOG: MAIN
 LOG: MAIN
   *> accept <accept@y> R=accept T=appendfile
 LOG: MAIN


@@ -355,13 +430,16 @@ LOG: delay_delivery MAIN
   no immediate delivery: queued by ACL
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local-smtp S=sss
   no immediate delivery: queued by ACL
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local-smtp S=sss

-delivering 10HmbA-0005vi-00
+delivering 10HmbA-000000005vi-0000

 LOG: MAIN
   *> accept <accept@y> R=accept T=appendfile
 LOG: MAIN
   Completed
 LOG: smtp_connection MAIN
 LOG: MAIN
   *> accept <accept@y> R=accept T=appendfile
 LOG: MAIN
   Completed
 LOG: smtp_connection MAIN

-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT
+>>> host in hosts_connection_nolog?
+>>>  list element: 
+>>>  list element: 127.0.0.1

 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)
 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)


@@ -371,19 +449,25 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]

 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "nested_drop"
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "nested_drop"

->>> processing "accept" (TESTSUITE/test-config 44)
+>>> processing ACL nested_drop "accept" (TESTSUITE/test-config 46)

 >>> check acl = drop
 >>>  using ACL "drop"
 >>> check acl = drop
 >>>  using ACL "drop"

->>>  processing "drop" (TESTSUITE/test-config 41)
+>>>  processing ACL drop "drop" (TESTSUITE/test-config 43)

 >>>    message: forcibly dropped
 >>>    message: forcibly dropped

->>>  drop: condition test succeeded in ACL "drop"
->>>  end of ACL "drop": DROP
->>> accept: condition test yielded "drop" in ACL "nested_drop"
+>>>  drop: condition test succeeded in ACL drop
+>>>  end of ACL drop: DROP
+>>> accept: condition test yielded "drop" in ACL nested_drop

 >>> accept: endpass encountered - denying access
 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop@y>: forcibly dropped
 >>> accept: endpass encountered - denying access
 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop@y>: forcibly dropped

-LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL
+LOG: SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by DROP in ACL
+>>> host in hosts_connection_nolog?
+>>>  list element: 
+>>>  list element: 127.0.0.1

 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)
 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)


@@ -393,18 +477,21 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]

 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "nested_drop_require"
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "nested_drop_require"

->>> processing "require" (TESTSUITE/test-config 48)
+>>> processing ACL nested_drop_require "require" (TESTSUITE/test-config 50)

 >>> check acl = drop
 >>>  using ACL "drop"
 >>> check acl = drop
 >>>  using ACL "drop"

->>>  processing "drop" (TESTSUITE/test-config 41)
+>>>  processing ACL drop "drop" (TESTSUITE/test-config 43)

 >>>    message: forcibly dropped
 >>>    message: forcibly dropped

->>>  drop: condition test succeeded in ACL "drop"
->>>  end of ACL "drop": DROP
->>> require: condition test yielded "drop" in ACL "nested_drop_require"
->>> end of ACL "nested_drop_require": not OK
+>>>  drop: condition test succeeded in ACL drop
+>>>  end of ACL drop: DROP
+>>> require: condition test yielded "drop" in ACL nested_drop_require
+>>> end of ACL nested_drop_require: not OK

 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop_require@y>: forcibly dropped
 LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop_require@y>: forcibly dropped

-LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL
+LOG: SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by DROP in ACL

 
 ******** SERVER ********
 
 ******** SERVER ********