X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6fc54bd18aa7a51e11dce5a905e754cedb526230..4f05f0f1dbdcfa60930e7a8182ae7756cede4314:/test/stderr/4001

diff --git a/test/stderr/4001 b/test/stderr/4001
index 85a793823..f13aef47d 100644
--- a/test/stderr/4001
+++ b/test/stderr/4001
@@ -6,122 +6,119 @@
 >>> 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 pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> mailserver.test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> mailserver.test in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
 >>>  host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
->>> host in tls_advertise_hosts?
->>> processing "accept" (TESTSUITE/test-config 25)
+>>> processing inline ACL "accept"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
->>> processing "accept" (TESTSUITE/test-config 23)
+>>> processing ACL check_data "accept" (TESTSUITE/test-config 23)
 >>> check logwrite = mime_acl: mime_part_count $mime_part_count
 >>>                = mime_acl: mime_part_count -1
-LOG: 10HmaX-0005vi-00 mime_acl: mime_part_count -1
->>> accept: condition test succeeded in ACL "check_data"
->>> end of ACL "check_data": ACCEPT
-LOG: 10HmaX-0005vi-00 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss
->>> processing "accept" (TESTSUITE/test-config 25)
+LOG: 10HmaX-000000005vi-0000 mime_acl: mime_part_count -1
+>>> accept: condition test succeeded in ACL check_data
+>>> end of ACL check_data: ACCEPT
+LOG: 10HmaX-000000005vi-0000 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss
+>>> processing inline ACL "accept"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_mime"
->>> processing "accept" (TESTSUITE/test-config 19)
+>>> processing ACL check_mime "accept" (TESTSUITE/test-config 19)
 >>> check decode = default
 >>> check logwrite = mime_acl: mime_part_count $mime_part_count
 >>>                = mime_acl: mime_part_count 0
-LOG: 10HmaY-0005vi-00 mime_acl: mime_part_count 0
->>> accept: condition test succeeded in ACL "check_mime"
->>> end of ACL "check_mime": ACCEPT
+LOG: 10HmaY-000000005vi-0000 mime_acl: mime_part_count 0
+>>> accept: condition test succeeded in ACL check_mime
+>>> end of ACL check_mime: ACCEPT
 >>> using ACL "check_mime"
->>> processing "accept" (TESTSUITE/test-config 19)
+>>> processing ACL check_mime "accept" (TESTSUITE/test-config 19)
 >>> check decode = default
 >>> check logwrite = mime_acl: mime_part_count $mime_part_count
 >>>                = mime_acl: mime_part_count 1
-LOG: 10HmaY-0005vi-00 mime_acl: mime_part_count 1
->>> accept: condition test succeeded in ACL "check_mime"
->>> end of ACL "check_mime": ACCEPT
+LOG: 10HmaY-000000005vi-0000 mime_acl: mime_part_count 1
+>>> accept: condition test succeeded in ACL check_mime
+>>> end of ACL check_mime: ACCEPT
 >>> using ACL "check_mime"
->>> processing "accept" (TESTSUITE/test-config 19)
+>>> processing ACL check_mime "accept" (TESTSUITE/test-config 19)
 >>> check decode = default
 >>> check logwrite = mime_acl: mime_part_count $mime_part_count
 >>>                = mime_acl: mime_part_count 2
-LOG: 10HmaY-0005vi-00 mime_acl: mime_part_count 2
->>> accept: condition test succeeded in ACL "check_mime"
->>> end of ACL "check_mime": ACCEPT
+LOG: 10HmaY-000000005vi-0000 mime_acl: mime_part_count 2
+>>> accept: condition test succeeded in ACL check_mime
+>>> end of ACL check_mime: ACCEPT
 >>> using ACL "check_data"
->>> processing "accept" (TESTSUITE/test-config 23)
+>>> processing ACL check_data "accept" (TESTSUITE/test-config 23)
 >>> check logwrite = mime_acl: mime_part_count $mime_part_count
 >>>                = mime_acl: mime_part_count 2
-LOG: 10HmaY-0005vi-00 mime_acl: mime_part_count 2
->>> accept: condition test succeeded in ACL "check_data"
->>> end of ACL "check_data": ACCEPT
->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-0005vi-00/FFFFFFFFF'
->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-0005vi-00/FFFFFFFFF'
->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-0005vi-00/FFFFFFFFF'
->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-0005vi-00/FFFFFFFFF'
-LOG: 10HmaY-0005vi-00 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss
->>> processing "accept" (TESTSUITE/test-config 25)
+LOG: 10HmaY-000000005vi-0000 mime_acl: mime_part_count 2
+>>> accept: condition test succeeded in ACL check_data
+>>> end of ACL check_data: ACCEPT
+>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-000000005vi-0000/FFFFFFFFF'
+>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-000000005vi-0000/FFFFFFFFF'
+>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-000000005vi-0000/FFFFFFFFF'
+>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaY-000000005vi-0000/FFFFFFFFF'
+LOG: 10HmaY-000000005vi-0000 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss
+>>> processing inline ACL "accept"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_mime"
->>> processing "accept" (TESTSUITE/test-config 19)
+>>> processing ACL check_mime "accept" (TESTSUITE/test-config 19)
 >>> check decode = default
 >>> check logwrite = mime_acl: mime_part_count $mime_part_count
 >>>                = mime_acl: mime_part_count 0
-LOG: 10HmaZ-0005vi-00 mime_acl: mime_part_count 0
->>> accept: condition test succeeded in ACL "check_mime"
->>> end of ACL "check_mime": ACCEPT
+LOG: 10HmaZ-000000005vi-0000 mime_acl: mime_part_count 0
+>>> accept: condition test succeeded in ACL check_mime
+>>> end of ACL check_mime: ACCEPT
 >>> using ACL "check_mime"
->>> processing "accept" (TESTSUITE/test-config 19)
+>>> processing ACL check_mime "accept" (TESTSUITE/test-config 19)
 >>> check decode = default
 >>> check logwrite = mime_acl: mime_part_count $mime_part_count
 >>>                = mime_acl: mime_part_count 1
-LOG: 10HmaZ-0005vi-00 mime_acl: mime_part_count 1
->>> accept: condition test succeeded in ACL "check_mime"
->>> end of ACL "check_mime": ACCEPT
+LOG: 10HmaZ-000000005vi-0000 mime_acl: mime_part_count 1
+>>> accept: condition test succeeded in ACL check_mime
+>>> end of ACL check_mime: ACCEPT
 >>> using ACL "check_mime"
->>> processing "accept" (TESTSUITE/test-config 19)
+>>> processing ACL check_mime "accept" (TESTSUITE/test-config 19)
 >>> check decode = default
 >>> check logwrite = mime_acl: mime_part_count $mime_part_count
 >>>                = mime_acl: mime_part_count 2
-LOG: 10HmaZ-0005vi-00 mime_acl: mime_part_count 2
->>> accept: condition test succeeded in ACL "check_mime"
->>> end of ACL "check_mime": ACCEPT
+LOG: 10HmaZ-000000005vi-0000 mime_acl: mime_part_count 2
+>>> accept: condition test succeeded in ACL check_mime
+>>> end of ACL check_mime: ACCEPT
 >>> using ACL "check_data"
->>> processing "accept" (TESTSUITE/test-config 23)
+>>> processing ACL check_data "accept" (TESTSUITE/test-config 23)
 >>> check logwrite = mime_acl: mime_part_count $mime_part_count
 >>>                = mime_acl: mime_part_count 2
-LOG: 10HmaZ-0005vi-00 mime_acl: mime_part_count 2
->>> accept: condition test succeeded in ACL "check_data"
->>> end of ACL "check_data": ACCEPT
->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-0005vi-00/FFFFFFFFF'
->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-0005vi-00/FFFFFFFFF'
->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-0005vi-00/FFFFFFFFF'
->>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-0005vi-00/FFFFFFFFF'
-LOG: 10HmaZ-0005vi-00 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss
->>> processing "accept" (TESTSUITE/test-config 25)
+LOG: 10HmaZ-000000005vi-0000 mime_acl: mime_part_count 2
+>>> accept: condition test succeeded in ACL check_data
+>>> end of ACL check_data: ACCEPT
+>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/FFFFFFFFF'
+>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/FFFFFFFFF'
+>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/FFFFFFFFF'
+>>> unspool_mbox(): unlinking 'TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/FFFFFFFFF'
+LOG: 10HmaZ-000000005vi-0000 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss
+>>> processing inline ACL "accept"
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> using ACL "check_data"
->>> processing "accept" (TESTSUITE/test-config 23)
+>>> processing ACL check_data "accept" (TESTSUITE/test-config 23)
 >>> check logwrite = mime_acl: mime_part_count $mime_part_count
 >>>                = mime_acl: mime_part_count -1
-LOG: 10HmbA-0005vi-00 mime_acl: mime_part_count -1
->>> accept: condition test succeeded in ACL "check_data"
->>> end of ACL "check_data": ACCEPT
-LOG: 10HmbA-0005vi-00 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss
+LOG: 10HmbA-000000005vi-0000 mime_acl: mime_part_count -1
+>>> accept: condition test succeeded in ACL check_data
+>>> end of ACL check_data: ACCEPT
+LOG: 10HmbA-000000005vi-0000 <= sender@test.ex H=(mailserver.test) [127.0.0.1] P=esmtp S=sss