Testsuite: output changes resulting

[exim.git] / test / stderr / 5403

diff --git a/test/stderr/5403 b/test/stderr/5403
index be89b3e22eff57cf3b8a9d2894ddd48838b8860a..f5f7a383134ccce3a54305e534ed3824a4642a60 100644 (file)
--- a/test/stderr/5403
+++ b/test/stderr/5403
@@ -6,22 +6,17 @@
 >>> 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: 
 >>> myhost.test.ex in helo_lookup_domains?
 >>>  list element: @
 >>>  myhost.test.ex in helo_lookup_domains? yes (matched "@")
 >>> looking up host name for 1.2.3.4
 LOG: no host name found for IP address 1.2.3.4
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> 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?
 >>> using ACL "ar"
 >>> processing "warn" (TESTSUITE/test-config 21)
 >>> check control = cutthrough_delivery
@@ -36,7 +31,7 @@ LOG: rcpt for plain@domain.com
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> accept: condition test succeeded in ACL "ar"
 >>> end of ACL "ar": ACCEPT
-LOG: 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for plain@domain.com
+LOG: 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for plain@domain.com
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -45,22 +40,17 @@ LOG: 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=es
 >>> 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: 
 >>> myhost.test.ex in helo_lookup_domains?
 >>>  list element: @
 >>>  myhost.test.ex in helo_lookup_domains? yes (matched "@")
 >>> looking up host name for 1.2.3.4
 LOG: no host name found for IP address 1.2.3.4
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> 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?
 >>> using ACL "ar"
 >>> processing "warn" (TESTSUITE/test-config 21)
 >>> check control = cutthrough_delivery
@@ -128,4 +118,4 @@ MUNGED: ::1 will be omitted in what follows
 >>>   SMTP(close)>>
 >>> cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:220'
 >>> ----------- cutthrough shutdown (host-checking mode) ------------
-LOG: 10HmaY-0005vi-00 <= sender@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com
+LOG: 10HmaY-000000005vi-0000 <= sender@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com