diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2022-12-29 18:53:44 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2022-12-29 21:17:12 +0000 |
| commit | 0c6608531368096bafebac4e488f84891368b006 (patch) | |
| tree | c3e93eed5f3c3bfca1c7438104040a3007298200 /test | |
| parent | caf28f95ce0a617b075cf66e24a0e4b0b8aaf18e (diff) | |
| download | exim4-0c6608531368096bafebac4e488f84891368b006.tar.gz | |
Testsuite: munge for list-search debug output of build-time options
Broken-by: 6fc54bd18aa7
Diffstat (limited to 'test')
123 files changed, 14 insertions, 787 deletions
diff --git a/test/runtest b/test/runtest index b9bcde89e..cde86047b 100755 --- a/test/runtest +++ b/test/runtest @@ -1248,6 +1248,7 @@ RESET_AFTER_EXTRA_LINE_READ: # Skip tls_advertise_hosts and hosts_require_tls checks when the options # are unset, because tls ain't always there. + next if /^(>>>)?\s*host in tls_advertise_hosts\?$/; next if /in\s(?:tls_advertise_hosts\?|hosts_require_tls\?) \sno\s\((option\sunset|end\sof\slist)\)/x; @@ -1341,7 +1342,13 @@ RESET_AFTER_EXTRA_LINE_READ: next if /host in hosts_proxy\?/; # PIPE_CONNECT - next if / in (pipelining_connect_advertise_hosts|hosts_pipe_connect)?\? no /; + if ( /^(>>>)?\s*host in pipelining_connect_advertise_hosts\?$/ ) + { + $_ = <IN>; + while ( /^(>>>)?\s*list element:/ ) { $_ = <IN>; } + goto RESET_AFTER_EXTRA_LINE_READ; + } + next if / in (?:pipelining_connect_advertise_hosts|hosts_pipe_connect)?\? no /; # Experimental_International next if / in smtputf8_advertise_hosts\? no \(option unset\)/; @@ -1350,6 +1357,12 @@ RESET_AFTER_EXTRA_LINE_READ: next if / in tls_advertise_requiretls?\? no \(end of list\)/; # Experimental_LIMITS + if ( /^(>>>)?\s*host in limits_advertise_hosts\?$/ ) + { + $_ = <IN>; + while ( /^(>>>)?\s*list element: !\*$/ ) { $_ = <IN>; } + goto RESET_AFTER_EXTRA_LINE_READ; + } next if / in limits_advertise_hosts?\? no \(matched "!\*"\)/; # TCP Fast Open diff --git a/test/stderr/0002 b/test/stderr/0002 index 23719fc5b..0325339d1 100644 --- a/test/stderr/0002 +++ b/test/stderr/0002 @@ -549,8 +549,6 @@ search_tidyup called >>> processing "accept" (TESTSUITE/test-config 42) >>> accept: condition test succeeded in ACL "connect0" >>> end of ACL "connect0": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -641,8 +639,6 @@ LOG: 10HmbB-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "accept" (TESTSUITE/test-config 42) >>> accept: condition test succeeded in ACL "connect0" >>> end of ACL "connect0": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -674,8 +670,6 @@ LOG: 10HmbC-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "accept" (TESTSUITE/test-config 42) >>> accept: condition test succeeded in ACL "connect0" >>> end of ACL "connect0": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0003 b/test/stderr/0003 index 7bc624634..e8f65c376 100644 --- a/test/stderr/0003 +++ b/test/stderr/0003 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0004 b/test/stderr/0004 index 90a80d64a..8da1bf2e4 100644 --- a/test/stderr/0004 +++ b/test/stderr/0004 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0017 b/test/stderr/0017 index 02abbec62..0562e1739 100644 --- a/test/stderr/0017 +++ b/test/stderr/0017 @@ -6,8 +6,6 @@ >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -44,8 +42,6 @@ LOG: H=[1.1.1.1] rejected ETRN some.random.domain >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -67,8 +63,6 @@ LOG: H=[10.9.8.7] temporarily rejected ETRN some.domain: cannot test sender_doma >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") diff --git a/test/stderr/0018 b/test/stderr/0018 index 7e1a72bfd..6f2a34b3d 100644 --- a/test/stderr/0018 +++ b/test/stderr/0018 @@ -6,8 +6,6 @@ >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") diff --git a/test/stderr/0019 b/test/stderr/0019 index 55a2d7ec5..d0d127019 100644 --- a/test/stderr/0019 +++ b/test/stderr/0019 @@ -6,8 +6,6 @@ >>> 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: LOG: rejected HELO from [10.10.10.10]: syntactically invalid argument(s): !@#$%^&*( LOG: SMTP syntax error in "debug" H=[10.10.10.10] unrecognized command LOG: SMTP syntax error in "rhubarb" H=[10.10.10.10] unrecognized command diff --git a/test/stderr/0020 b/test/stderr/0020 index 354c7dadb..5e9e4259f 100644 --- a/test/stderr/0020 +++ b/test/stderr/0020 @@ -590,5 +590,3 @@ >>> host in "10.250.104.0/21"? yes (matched "10.250.104.0/21") >>> accept: condition test succeeded in ACL "check_connect" >>> end of ACL "check_connect": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: diff --git a/test/stderr/0021 b/test/stderr/0021 index 6c9d189b3..f896eddde 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -34,8 +34,6 @@ LOG: MAIN 10.9.8.8 accepted by connect ACL accept: condition test succeeded in ACL "connect" end of ACL "connect": ACCEPT -host in pipelining_connect_advertise_hosts? - list element: host in hosts_require_helo? list element: host in hosts_require_helo? no (end of list) @@ -194,8 +192,6 @@ LOG: MAIN 10.9.8.8 accepted by connect ACL accept: condition test succeeded in ACL "connect" end of ACL "connect": ACCEPT -host in pipelining_connect_advertise_hosts? - list element: host in hosts_require_helo? list element: host in hosts_require_helo? no (end of list) diff --git a/test/stderr/0022 b/test/stderr/0022 index c04f4002b..536e4278b 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -25,8 +25,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test @@ -107,8 +105,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test @@ -192,8 +188,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test @@ -263,8 +257,6 @@ 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 pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -298,8 +290,6 @@ 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 pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -326,8 +316,6 @@ 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 pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -361,8 +349,6 @@ 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 pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -451,8 +437,6 @@ 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 pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -481,8 +465,6 @@ 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 pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0023 b/test/stderr/0023 index 7230d8557..4645a98a9 100644 --- a/test/stderr/0023 +++ b/test/stderr/0023 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -313,8 +311,6 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@wontpass>: x@wontpass shall not >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -375,8 +371,6 @@ LOG: H=(test) [5.6.7.8] F=<x@y> rejected RCPT <x@test.ex> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -408,8 +402,6 @@ LOG: H=(test) [5.6.7.8] F=<x@y> rejected RCPT <x@test.ex> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -457,8 +449,6 @@ LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -516,8 +506,6 @@ LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -639,8 +627,6 @@ LOG: H=(test) [5.6.8.1] F=<user2@domain1> rejected RCPT <x@y> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -675,8 +661,6 @@ LOG: H=(test) [5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -726,8 +710,6 @@ LOG: H=(test) [5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -760,8 +742,6 @@ LOG: H=(test) [5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -859,8 +839,6 @@ LOG: H=(test) [8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -926,8 +904,6 @@ LOG: H=(test) [5.6.13.1] F=<x@y> rejected RCPT <x2@y> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -965,8 +941,6 @@ LOG: H=(test) [V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.e >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1006,8 +980,6 @@ LOG: H=(test) [V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.e >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1050,8 +1022,6 @@ LOG: H=(test) [20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1118,8 +1088,6 @@ LOG: H=(test) [20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable addres >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1258,8 +1226,6 @@ LOG: H=(test) [21.21.21.21] F=<fail@y> rejected RCPT <x@y>: Sender verify failed >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1292,8 +1258,6 @@ LOG: H=(test) [22.22.22.22] F=<userx@y> rejected RCPT <userx@y> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1355,8 +1319,6 @@ LOG: H=(test) [23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1379,8 +1341,6 @@ LOG: H=(test) [23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1400,8 +1360,6 @@ LOG: H=(test) [24.24.24.24] F=<x@y> rejected RCPT <userx@y> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1424,8 +1382,6 @@ LOG: H=(test) [25.25.25.25] F=<x@y> rejected RCPT <x@y> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1475,8 +1431,6 @@ LOG: H=(test) [26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have o >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1497,8 +1451,6 @@ LOG: H=(test) [26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have o >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1541,8 +1493,6 @@ LOG: H=(test) [28.28.28.28] F=<a@baddomain> rejected RCPT <x@y> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1570,8 +1520,6 @@ LOG: H=(test) [28.28.28.28] F=<a@baddomain> rejected RCPT <x@y> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1593,8 +1541,6 @@ LOG: H=(test) [V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for re >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1623,8 +1569,6 @@ LOG: H=(test) [V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1651,8 +1595,6 @@ LOG: H=(test) [V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1690,8 +1632,6 @@ LOG: H=(test) [29.29.29.29] F=<a@localhost> rejected RCPT <x@y> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1748,8 +1688,6 @@ LOG: H=(test) [30.30.30.30] F=<a@13.12.11.V4NET.rbl> rejected RCPT <x@y>: domain >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1772,8 +1710,6 @@ LOG: dnslist query is too long (ignored): y+extra+extra+extra+extra+extra+extra+ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1815,8 +1751,6 @@ LOG: H=(test) [33.33.33.33] F=<x@y> rejected RCPT <x2@y>: Sender verify failed >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -1864,8 +1798,6 @@ LOG: H=(test) [44.44.44.1] Warning: ACL "warn" statement skipped: condition test >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0026 b/test/stderr/0026 index 870525bab..9c780e2a1 100644 --- a/test/stderr/0026 +++ b/test/stderr/0026 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -40,8 +38,6 @@ LOG: 10HmbI-0005vi-00 H=(test) [10.0.0.0] F=<x@y> rejected after DATA: domain mi >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0034 b/test/stderr/0034 index 86bca69a4..1dca5fcd8 100644 --- a/test/stderr/0034 +++ b/test/stderr/0034 @@ -6,8 +6,6 @@ >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: !10.0.0.1 >>> host in smtp_accept_max_nonmail_hosts? yes (end of list) @@ -20,8 +18,6 @@ LOG: SMTP call from [10.0.0.2] dropped: too many nonmail commands (last was "rse >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: !10.0.0.1 >>> host in smtp_accept_max_nonmail_hosts? no (matched "!10.0.0.1") diff --git a/test/stderr/0038 b/test/stderr/0038 index 4090b5938..74050591d 100644 --- a/test/stderr/0038 +++ b/test/stderr/0038 @@ -6,21 +6,16 @@ >>> 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: >>> test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_rcpt" >>> processing "warn" (TESTSUITE/test-config 23) >>> check ratelimit = 0/1h/strict @@ -56,21 +51,16 @@ LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> 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: >>> test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_rcpt" >>> processing "warn" (TESTSUITE/test-config 23) >>> check ratelimit = 0/1h/strict @@ -105,21 +95,16 @@ LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> 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: >>> test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_rcpt" >>> processing "warn" (TESTSUITE/test-config 23) >>> check ratelimit = 0/1h/per_conn/strict @@ -155,21 +140,16 @@ LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> 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: >>> test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_rcpt" >>> processing "warn" (TESTSUITE/test-config 23) >>> check ratelimit = 0/1h/per_conn/strict @@ -204,21 +184,16 @@ LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> 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: >>> test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_rcpt" >>> processing "warn" (TESTSUITE/test-config 23) >>> check ratelimit = 0/1h/per_rcpt @@ -282,21 +257,16 @@ LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> 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: >>> test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_rcpt2" >>> processing "warn" (TESTSUITE/test-config 31) >>> check ratelimit = 1/1m/per_rcpt/noupdate diff --git a/test/stderr/0041 b/test/stderr/0041 index 05663f3ef..c25d0597e 100644 --- a/test/stderr/0041 +++ b/test/stderr/0041 @@ -8,8 +8,6 @@ >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -97,8 +95,6 @@ LOG: H=[1.1.1.1] rejected EXPN postmaster >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -137,8 +133,6 @@ LOG: H=[1.1.1.1] rejected EXPN postmaster >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") diff --git a/test/stderr/0042 b/test/stderr/0042 index 76b3ad5f0..e12a18566 100644 --- a/test/stderr/0042 +++ b/test/stderr/0042 @@ -6,8 +6,6 @@ >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") diff --git a/test/stderr/0043 b/test/stderr/0043 index 9a1b19a0d..70b55e29e 100644 --- a/test/stderr/0043 +++ b/test/stderr/0043 @@ -6,21 +6,16 @@ >>> 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: >>> exim.test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> exim.test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_recipient" >>> processing "accept" (TESTSUITE/test-config 20) >>> check hosts = : diff --git a/test/stderr/0044 b/test/stderr/0044 index 06337c586..f9fdd4a38 100644 --- a/test/stderr/0044 +++ b/test/stderr/0044 @@ -22,8 +22,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< ehlo exim.test.ex @@ -34,15 +32,12 @@ exim.test.ex in helo_lookup_domains? no (end of list) sender_fullhost = (exim.test.ex) [V4NET.11.12.13] sender_rcvhost = [V4NET.11.12.13] (helo=exim.test.ex) set_process_info: pppp handling incoming connection from (exim.test.ex) [V4NET.11.12.13] -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? SMTP>> 250-the.local.host.name Hello exim.test.ex [V4NET.11.12.13] 250-SIZE 52428800 250-8BITMIME @@ -184,21 +179,16 @@ search_tidyup called >>> 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: >>> exim.test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> exim.test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check hosts = : @@ -248,8 +238,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< ehlo exim.test.ex @@ -260,15 +248,12 @@ exim.test.ex in helo_lookup_domains? no (end of list) sender_fullhost = (exim.test.ex) [V4NET.99.99.99] sender_rcvhost = [V4NET.99.99.99] (helo=exim.test.ex) set_process_info: pppp handling incoming connection from (exim.test.ex) [V4NET.99.99.99] -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? SMTP>> 250-the.local.host.name Hello exim.test.ex [V4NET.99.99.99] 250-SIZE 52428800 250-8BITMIME diff --git a/test/stderr/0056 b/test/stderr/0056 index a5a6ef343..f7af1bb98 100644 --- a/test/stderr/0056 +++ b/test/stderr/0056 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0057 b/test/stderr/0057 index 91ac7d335..902d8207e 100644 --- a/test/stderr/0057 +++ b/test/stderr/0057 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0058 b/test/stderr/0058 index 2d7aa7da1..ccd4bb494 100644 --- a/test/stderr/0058 +++ b/test/stderr/0058 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0059 b/test/stderr/0059 index b9b6e0ea3..97765a8b0 100644 --- a/test/stderr/0059 +++ b/test/stderr/0059 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0060 b/test/stderr/0060 index 8bf5a304f..d0eb28dd3 100644 --- a/test/stderr/0060 +++ b/test/stderr/0060 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -69,8 +67,6 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smt >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -141,8 +137,6 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.2] P=smt >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -209,8 +203,6 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.5] P=smt >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -277,8 +269,6 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.6] P=smt >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -337,8 +327,6 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.1] P=s >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -398,8 +386,6 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.2] P=s >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -460,8 +446,6 @@ LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.3] P=s >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0061 b/test/stderr/0061 index b9db55b4e..3e53bc47a 100644 --- a/test/stderr/0061 +++ b/test/stderr/0061 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -65,8 +63,6 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smt >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0062 b/test/stderr/0062 index 2580c011b..878ae5dbc 100644 --- a/test/stderr/0062 +++ b/test/stderr/0062 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -76,8 +74,6 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NE >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -141,8 +137,6 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NE >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0063 b/test/stderr/0063 index 94f2ff536..fb37af469 100644 --- a/test/stderr/0063 +++ b/test/stderr/0063 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -71,8 +69,6 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NE >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0064 b/test/stderr/0064 index addb0e1e8..7c5f9785f 100644 --- a/test/stderr/0064 +++ b/test/stderr/0064 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -71,8 +69,6 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NE >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0065 b/test/stderr/0065 index 8d1b845b0..40d4d4002 100644 --- a/test/stderr/0065 +++ b/test/stderr/0065 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -62,8 +60,6 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.4] P=smtp S= >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -123,8 +119,6 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.5] P=smtp S= >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -181,8 +175,6 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.4.5] P=smtp S= >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -246,8 +238,6 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [1.3.2.4] P=smtp S= >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -305,8 +295,6 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [131.111.8.2] P=smt >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -365,8 +353,6 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [192.152.98.3] P=sm >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0066 b/test/stderr/0066 index 35b3d564d..8537054c8 100644 --- a/test/stderr/0066 +++ b/test/stderr/0066 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -69,8 +67,6 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.4] P=smtp S= >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -136,8 +132,6 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.5] P=smtp S= >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -199,8 +193,6 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.4.5] P=smtp S= >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -269,8 +261,6 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [1.3.2.4] P=smtp S= >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -332,8 +322,6 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [131.111.8.2] P=smt >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -395,8 +383,6 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [192.152.98.3] P=sm >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -463,8 +449,6 @@ LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NE >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -526,8 +510,6 @@ LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.11.12.13] P= >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0067 b/test/stderr/0067 index 595d2ad64..234a174bc 100644 --- a/test/stderr/0067 +++ b/test/stderr/0067 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0068 b/test/stderr/0068 index 75da05f25..45520fa02 100644 --- a/test/stderr/0068 +++ b/test/stderr/0068 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0069 b/test/stderr/0069 index 10bc7727b..449102e17 100644 --- a/test/stderr/0069 +++ b/test/stderr/0069 @@ -14,8 +14,6 @@ >>> 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: >>> using ACL "check_recipientx" >>> processing "accept" (TESTSUITE/test-config 24) >>> check hosts = : @@ -47,8 +45,6 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -86,8 +82,6 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -121,8 +115,6 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -155,8 +147,6 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -191,8 +181,6 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -231,8 +219,6 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -263,8 +249,6 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0070 b/test/stderr/0070 index f40155a67..21208fd55 100644 --- a/test/stderr/0070 +++ b/test/stderr/0070 @@ -10,8 +10,6 @@ MUNGED: ::1 will be omitted in what follows >>> name=ten-1.test.ex address=V4NET.0.0.1 >>> host in helo_verify_hosts? yes (matched "ten-1.test.ex") >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: LOG: rejected MAIL from [V4NET.0.0.1]: no HELO/EHLO given >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) @@ -35,8 +33,6 @@ MUNGED: ::1 will be omitted in what follows >>> name=ten-2.test.ex address=V4NET.0.0.2 >>> host in helo_try_verify_hosts? no (end of list) >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> host in hosts_require_helo? >>> host in hosts_require_helo? no (end of list) >>> using ACL "rcpt" @@ -70,8 +66,6 @@ MUNGED: ::1 will be omitted in what follows >>> name=ten-2.test.ex address=V4NET.0.0.2 >>> host in helo_try_verify_hosts? yes (matched "ten-2.test.ex") >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> [V4NET.0.0.1] in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -107,8 +101,6 @@ MUNGED: ::1 will be omitted in what follows >>> name=ten-2.test.ex address=V4NET.0.0.2 >>> host in helo_try_verify_hosts? yes (matched "ten-2.test.ex") >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> [V4NET.0.0.2] in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -137,8 +129,6 @@ MUNGED: ::1 will be omitted in what follows >>> name=ten-1.test.ex address=V4NET.0.0.1 >>> host in helo_verify_hosts? yes (matched "ten-1.test.ex") >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> ten-1.test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -165,8 +155,6 @@ MUNGED: ::1 will be omitted in what follows >>> name=ten-3.test.ex address=V4NET.0.0.3 >>> host in helo_verify_hosts? yes (matched "ten-3.test.ex") >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> ten-3.test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -206,8 +194,6 @@ MUNGED: ::1 will be omitted in what follows >>> name=ten-1.test.ex address=V4NET.0.0.1 >>> host in helo_verify_hosts? yes (matched "ten-1.test.ex") >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> rhubarb in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -241,8 +227,6 @@ MUNGED: ::1 will be omitted in what follows >>> list element: 99.99.99.99 >>> host in helo_verify_hosts? yes (matched "99.99.99.99") >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> rhubarb in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -279,8 +263,6 @@ MUNGED: ::1 will be omitted in what follows >>> name=ten-2.test.ex address=V4NET.0.0.2 >>> host in helo_try_verify_hosts? no (end of list) >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> [V4NET.0.0.99] in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -315,8 +297,6 @@ MUNGED: ::1 will be omitted in what follows >>> name=ten-2.test.ex address=V4NET.0.0.2 >>> host in helo_try_verify_hosts? no (end of list) >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> [V4NET.0.0.13] in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -355,21 +335,16 @@ MUNGED: ::1 will be omitted in what follows >>> name=ten-2.test.ex address=V4NET.0.0.2 >>> host in helo_try_verify_hosts? no (end of list) >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> rhubarb in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> rhubarb in helo_lookup_domains? no (end of list) ->>> 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 "rcpt" >>> processing "require" (TESTSUITE/test-config 23) >>> message: helo not verified diff --git a/test/stderr/0077 b/test/stderr/0077 index 78811045c..855456f48 100644 --- a/test/stderr/0077 +++ b/test/stderr/0077 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -44,8 +42,6 @@ MUNGED: ::1 will be omitted in what follows >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -78,8 +74,6 @@ MUNGED: ::1 will be omitted in what follows >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0079 b/test/stderr/0079 index 51f04b985..710c7da01 100644 --- a/test/stderr/0079 +++ b/test/stderr/0079 @@ -6,21 +6,16 @@ >>> 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: >>> exim.test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> exim.test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_recipient" >>> processing "accept" (TESTSUITE/test-config 24) >>> check hosts = : diff --git a/test/stderr/0080 b/test/stderr/0080 index e8858b5cf..ffed589d3 100644 --- a/test/stderr/0080 +++ b/test/stderr/0080 @@ -6,21 +6,16 @@ >>> 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: >>> exim.test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> exim.test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_recipient" >>> processing "accept" (TESTSUITE/test-config 19) >>> check recipients = postmaster@exim.test.ex diff --git a/test/stderr/0086 b/test/stderr/0086 index e5d56e319..bc1d1aba6 100644 --- a/test/stderr/0086 +++ b/test/stderr/0086 @@ -8,8 +8,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -37,8 +35,6 @@ LOG: 10HmaY-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -66,8 +62,6 @@ LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -95,8 +89,6 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -124,8 +116,6 @@ LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -153,8 +143,6 @@ LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0087 b/test/stderr/0087 index 4e11a909d..9b29e9864 100644 --- a/test/stderr/0087 +++ b/test/stderr/0087 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -62,8 +60,6 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -118,8 +114,6 @@ LOG: 10HmaY-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -180,8 +174,6 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@test.ex> rejected after >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -246,8 +238,6 @@ LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0089 b/test/stderr/0089 index f9289090f..369e13cef 100644 --- a/test/stderr/0089 +++ b/test/stderr/0089 @@ -14,8 +14,6 @@ LOG: no host name found for IP address V4NET.0.0.0 >>> list element: *N-99.test.ex >>> sender host name required, to match against *N-99.test.ex >>> host in helo_accept_junk_hosts? no (failed to find host name for V4NET.0.0.0) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: LOG: rejected HELO from [V4NET.0.0.0]: syntactically invalid argument(s): @#$%^&*() >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * @@ -90,8 +88,6 @@ LOG: H=(abc_xyz) [V4NET.0.0.0] F=<userx@cus.cam.ac.uk> rejected RCPT <userx@else >>> host in helo_accept_junk_hosts? >>> list element: *N-99.test.ex >>> host in helo_accept_junk_hosts? yes (matched "*N-99.test.ex") ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 24) >>> check hosts = : diff --git a/test/stderr/0091 b/test/stderr/0091 index 18164df91..6bb9ac04b 100644 --- a/test/stderr/0091 +++ b/test/stderr/0091 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -51,8 +49,6 @@ LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.1] F=<junk@jink.jonk.test.ex> rejected >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -83,8 +79,6 @@ LOG: H=(test) [V4NET.0.0.2] F=<junk@jink.jonk.test.ex> rejected RCPT <root@test. >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -137,8 +131,6 @@ LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.2] F=<userx@test.ex> rejected after DA >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0092 b/test/stderr/0092 index 491a30ee4..740e09a02 100644 --- a/test/stderr/0092 +++ b/test/stderr/0092 @@ -6,8 +6,6 @@ >>> 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: LOG: SMTP command timeout on connection from [V4NET.0.0.1] >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) @@ -17,8 +15,6 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1] >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -110,8 +106,6 @@ host in helo_accept_junk_hosts? no (option unset) ├considering: $tod_full ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test @@ -175,8 +169,6 @@ exim: timed out while reading - message abandoned >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0094 b/test/stderr/0094 index e1d7ffc71..bd87a6bcd 100644 --- a/test/stderr/0094 +++ b/test/stderr/0094 @@ -10,8 +10,6 @@ LOG: no host name found for IP address V4NET.11.12.13 >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -61,8 +59,6 @@ LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.u >>> 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: >>> using ACL "check_recipient" >>> processing "accept" (TESTSUITE/test-config 23) >>> check hosts = : @@ -139,8 +135,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test diff --git a/test/stderr/0121 b/test/stderr/0121 index 96adb7f2f..b3c58bfc8 100644 --- a/test/stderr/0121 +++ b/test/stderr/0121 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -253,21 +251,16 @@ LOG: 10HmaZ-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> temporarily rejecte >>> 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: >>> foo.bar in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> foo.bar in helo_lookup_domains? no (end of list) ->>> 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? >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -275,51 +268,39 @@ LOG: 10HmaZ-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> temporarily rejecte >>> list element: @ >>> list element: @[] >>> foo.bar in helo_lookup_domains? no (end of list) ->>> 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? >>> foo.bar in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> foo.bar in helo_lookup_domains? no (end of list) ->>> 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? >>> foo.bar in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> foo.bar in helo_lookup_domains? no (end of list) ->>> 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? >>> foo.bar in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> foo.bar in helo_lookup_domains? no (end of list) ->>> 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? diff --git a/test/stderr/0124 b/test/stderr/0124 index 8eeff1d83..144f84497 100644 --- a/test/stderr/0124 +++ b/test/stderr/0124 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0130 b/test/stderr/0130 index e5a0a5899..5dbcd3e4b 100644 --- a/test/stderr/0130 +++ b/test/stderr/0130 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0138 b/test/stderr/0138 index f323c47a6..81f35c3d7 100644 --- a/test/stderr/0138 +++ b/test/stderr/0138 @@ -6,21 +6,16 @@ >>> 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: >>> exim.test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> exim.test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_recipient" >>> processing "accept" (TESTSUITE/test-config 17) >>> check hosts = : @@ -74,21 +69,16 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1 >>> 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: >>> exim.test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> exim.test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_recipient" >>> processing "accept" (TESTSUITE/test-config 17) >>> check hosts = : diff --git a/test/stderr/0139 b/test/stderr/0139 index 9bd5ee201..9e55b4934 100644 --- a/test/stderr/0139 +++ b/test/stderr/0139 @@ -6,8 +6,6 @@ >>> 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: >>> host in hosts_require_helo? >>> host in hosts_require_helo? no (end of list) >>> using ACL "check_mail" @@ -154,8 +152,6 @@ LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss >>> 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: >>> host in hosts_require_helo? >>> host in hosts_require_helo? no (end of list) >>> using ACL "check_mail" @@ -220,8 +216,6 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> 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: >>> host in hosts_require_helo? >>> host in hosts_require_helo? no (end of list) >>> using ACL "check_mail" @@ -269,8 +263,6 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> 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: >>> host in hosts_require_helo? >>> host in hosts_require_helo? no (end of list) >>> using ACL "check_mail" @@ -316,8 +308,6 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> 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: >>> a.b in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -347,8 +337,6 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -440,8 +428,6 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2] >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -533,8 +519,6 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100] >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -626,8 +610,6 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101] >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -719,8 +701,6 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102] >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -812,8 +792,6 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103] >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -906,8 +884,6 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104] >>> 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: >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") diff --git a/test/stderr/0145 b/test/stderr/0145 index 146ab1d02..1bbb9fe95 100644 --- a/test/stderr/0145 +++ b/test/stderr/0145 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -37,8 +35,6 @@ LOG: H=(test) [V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender veri >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0157 b/test/stderr/0157 index b658f1693..3a5a6fd65 100644 --- a/test/stderr/0157 +++ b/test/stderr/0157 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -80,8 +78,6 @@ LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -156,8 +152,6 @@ LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0175 b/test/stderr/0175 index bf4d5b811..cc6af4105 100644 --- a/test/stderr/0175 +++ b/test/stderr/0175 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -46,8 +44,6 @@ LOG: H=(test) [V4NET.0.0.0] F=<user@bad.domain> rejected RCPT <userx@test.ex>: S >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -93,8 +89,6 @@ LOG: H=(test) [V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>: >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0180 b/test/stderr/0180 index 69801e871..007e11063 100644 --- a/test/stderr/0180 +++ b/test/stderr/0180 @@ -6,21 +6,16 @@ >>> 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: >>> some.host in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> some.host in helo_lookup_domains? no (end of list) ->>> 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? >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -29,18 +24,13 @@ >>> 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: >>> some.host in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> some.host in helo_lookup_domains? no (end of list) ->>> 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? diff --git a/test/stderr/0230 b/test/stderr/0230 index c70bba481..9017df8f2 100644 --- a/test/stderr/0230 +++ b/test/stderr/0230 @@ -7,8 +7,6 @@ LOG: SMTP connection from [192.168.1.2]:1117 >>> 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: LOG: SMTP connection from [192.168.1.2]:1117 closed by QUIT ******** SERVER ******** diff --git a/test/stderr/0234 b/test/stderr/0234 index 709f73359..2a618bd17 100644 --- a/test/stderr/0234 +++ b/test/stderr/0234 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0243 b/test/stderr/0243 index 16c2f7aec..00f5d0a85 100644 --- a/test/stderr/0243 +++ b/test/stderr/0243 @@ -6,21 +6,16 @@ >>> 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: >>> xxxx in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> xxxx in helo_lookup_domains? no (end of list) ->>> 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 "check_recipient" >>> processing "deny" (TESTSUITE/test-config 20) >>> message: unrouteable address diff --git a/test/stderr/0251 b/test/stderr/0251 index 12bc5cf6b..558b3675e 100644 --- a/test/stderr/0251 +++ b/test/stderr/0251 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0255 b/test/stderr/0255 index aa85cd990..083897f81 100644 --- a/test/stderr/0255 +++ b/test/stderr/0255 @@ -6,8 +6,6 @@ >>> 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: LOG: SMTP call from [V4NET.0.0.0] dropped: too many unrecognized commands (last was "four") >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) @@ -17,6 +15,4 @@ LOG: SMTP call from [V4NET.0.0.0] dropped: too many unrecognized commands (last >>> 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: LOG: SMTP call from [V4NET.0.0.0] dropped: too many unrecognized commands (last was "two") diff --git a/test/stderr/0259 b/test/stderr/0259 index bc63b6295..449cd9184 100644 --- a/test/stderr/0259 +++ b/test/stderr/0259 @@ -6,8 +6,6 @@ >>> 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: >>> a.b.c in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -20,8 +18,6 @@ >>> 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: >>> a.b.c in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -34,8 +30,6 @@ >>> 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: >>> a.b.c in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -48,8 +42,6 @@ >>> 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: >>> a.b.c in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -62,8 +54,6 @@ >>> 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: >>> a.b.c in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -76,8 +66,6 @@ >>> 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: >>> a.b.c in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -90,8 +78,6 @@ >>> 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: >>> a.b.c in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0275 b/test/stderr/0275 index 93f03d09d..0bef81f35 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -532,8 +532,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< HELO test diff --git a/test/stderr/0277 b/test/stderr/0277 index a2c32c1eb..f57c5c50f 100644 --- a/test/stderr/0277 +++ b/test/stderr/0277 @@ -42,8 +42,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< quit @@ -103,8 +101,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< quit @@ -175,8 +171,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< quit @@ -247,8 +241,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< quit @@ -313,8 +305,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< quit diff --git a/test/stderr/0281 b/test/stderr/0281 index f9e369178..0d9e1a3be 100644 --- a/test/stderr/0281 +++ b/test/stderr/0281 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -282,8 +280,6 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <5@myhost.test.ex>: host doesn >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -310,8 +306,6 @@ MUNGED: ::1 will be omitted in what follows >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -339,8 +333,6 @@ MUNGED: ::1 will be omitted in what follows >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0294 b/test/stderr/0294 index 9b3290d72..3aea3bbc8 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -111,8 +111,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test @@ -172,8 +170,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test diff --git a/test/stderr/0303 b/test/stderr/0303 index da8ceff5c..02875c77d 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -6,8 +6,6 @@ >>> 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 "@") @@ -23,8 +21,6 @@ >>> 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: >>> [127.0.0.1] in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -33,15 +29,12 @@ >>> IP address lookup yielded "ten-1.test.ex" >>> checking addresses for ten-1.test.ex >>> V4NET.0.0.1 OK ->>> 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? >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -50,8 +43,6 @@ >>> 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: >>> rhubarb.custard in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -81,8 +72,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< EHLO [V4NET.2.3.4] @@ -93,15 +82,12 @@ SMTP<< EHLO [V4NET.2.3.4] sender_fullhost = ([V4NET.2.3.4]) [V4NET.2.3.4] sender_rcvhost = [V4NET.2.3.4] set_process_info: pppp handling incoming connection from ([V4NET.2.3.4]) [V4NET.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? SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4] 250-SIZE 52428800 250-8BITMIME @@ -170,23 +156,18 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< EHLO [V4NET.2.3.4] sender_fullhost = host.name.tld [V4NET.2.3.4] sender_rcvhost = host.name.tld ([V4NET.2.3.4]) set_process_info: pppp handling incoming connection from host.name.tld [V4NET.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? SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4] 250-SIZE 52428800 250-8BITMIME diff --git a/test/stderr/0304 b/test/stderr/0304 index 159c875a1..6fa019580 100644 --- a/test/stderr/0304 +++ b/test/stderr/0304 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0305 b/test/stderr/0305 index 1fc1cf15c..5da648d50 100644 --- a/test/stderr/0305 +++ b/test/stderr/0305 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0306 b/test/stderr/0306 index 26850055f..37b5cd641 100644 --- a/test/stderr/0306 +++ b/test/stderr/0306 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0308 b/test/stderr/0308 index 7745e4913..369fcf453 100644 --- a/test/stderr/0308 +++ b/test/stderr/0308 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -37,8 +35,6 @@ LOG: no host name found for IP address V4NET.0.0.97 >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0312 b/test/stderr/0312 index bd3338944..b21ba5724 100644 --- a/test/stderr/0312 +++ b/test/stderr/0312 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0325 b/test/stderr/0325 index c99c051e4..d5550ea88 100644 --- a/test/stderr/0325 +++ b/test/stderr/0325 @@ -14,8 +14,6 @@ r4: $local_part_data = LOCAL PART DATA >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0342 b/test/stderr/0342 index a76e26d36..c4414fe0c 100644 --- a/test/stderr/0342 +++ b/test/stderr/0342 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0362 b/test/stderr/0362 index de4e6d95e..868422d53 100644 --- a/test/stderr/0362 +++ b/test/stderr/0362 @@ -22,8 +22,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test diff --git a/test/stderr/0371 b/test/stderr/0371 index 0bf77157b..f926d4da0 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -28,8 +28,6 @@ check set acl_c9 = $acl_c9; connect = ; connect accept: condition test succeeded in ACL "connect" end of ACL "connect": ACCEPT -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< ehlo something @@ -40,15 +38,12 @@ something in helo_lookup_domains? no (end of list) sender_fullhost = (something) [V4NET.0.0.0] sender_rcvhost = [V4NET.0.0.0] (helo=something) set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0] -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? SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0] 250-SIZE 52428800 250-8BITMIME diff --git a/test/stderr/0381 b/test/stderr/0381 index 02fc23de1..6ad38b6f8 100644 --- a/test/stderr/0381 +++ b/test/stderr/0381 @@ -25,8 +25,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test diff --git a/test/stderr/0384 b/test/stderr/0384 index 733766f0a..048215ec7 100644 --- a/test/stderr/0384 +++ b/test/stderr/0384 @@ -7,23 +7,18 @@ >>> list element: * >>> host in helo_verify_hosts? yes (matched "*") >>> host in helo_accept_junk_hosts? no (option unset) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> [V4NET.9.8.7] in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> [V4NET.9.8.7] in helo_lookup_domains? no (end of list) >>> verifying EHLO/HELO argument "[V4NET.9.8.7]" >>> matched host address ->>> 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? >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") diff --git a/test/stderr/0386 b/test/stderr/0386 index ca912dc5a..10cee1adf 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -25,8 +25,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test @@ -197,8 +195,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test diff --git a/test/stderr/0391 b/test/stderr/0391 index 73fd5ce4a..d77f0cef7 100644 --- a/test/stderr/0391 +++ b/test/stderr/0391 @@ -20,8 +20,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test diff --git a/test/stderr/0401 b/test/stderr/0401 index 4c44ff833..9f12194fa 100644 --- a/test/stderr/0401 +++ b/test/stderr/0401 @@ -14,8 +14,6 @@ >>> host in "TESTSUITE/aux-var/0401.hosts1"? yes (matched "V4NET.9.8.7" in TESTSUITE/aux-var/0401.hosts1) >>> accept: condition test succeeded in ACL "connect" >>> end of ACL "connect": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> xxx in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0422 b/test/stderr/0422 index 11178b44a..1724b2438 100644 --- a/test/stderr/0422 +++ b/test/stderr/0422 @@ -19,8 +19,6 @@ >>> processing "accept" (TESTSUITE/test-config 21) >>> accept: condition test succeeded in ACL "connect" >>> end of ACL "connect": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) diff --git a/test/stderr/0432 b/test/stderr/0432 index f041804fe..06e40f039 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -51,8 +49,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test @@ -178,8 +174,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test @@ -253,8 +247,6 @@ search_tidyup called >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -285,8 +277,6 @@ MUNGED: ::1 will be omitted in what follows >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -340,8 +330,6 @@ MUNGED: ::1 will be omitted in what follows >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0443 b/test/stderr/0443 index 58d423dd7..295a87306 100644 --- a/test/stderr/0443 +++ b/test/stderr/0443 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0445 b/test/stderr/0445 index 5394493d9..9a272700a 100644 --- a/test/stderr/0445 +++ b/test/stderr/0445 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0453 b/test/stderr/0453 index 2fe5e4c2f..b5336954f 100644 --- a/test/stderr/0453 +++ b/test/stderr/0453 @@ -6,8 +6,6 @@ >>> 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: >>> xxxx in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0475 b/test/stderr/0475 index 25f85a813..c3d08c603 100644 --- a/test/stderr/0475 +++ b/test/stderr/0475 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0479 b/test/stderr/0479 index 548466bfa..66f30eeba 100644 --- a/test/stderr/0479 +++ b/test/stderr/0479 @@ -20,8 +20,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo [1.2.3.4] diff --git a/test/stderr/0480 b/test/stderr/0480 index 26631f87b..10296c432 100644 --- a/test/stderr/0480 +++ b/test/stderr/0480 @@ -6,8 +6,6 @@ >>> 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: >>> a.b.c in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -20,8 +18,6 @@ >>> 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: >>> a.b.c in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -35,8 +31,6 @@ LOG: failed to expand "${if eq{$received_ip_address}{V4NET.0.0.1}{host.V4NET.0.0 >>> 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: >>> a.b.c in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0513 b/test/stderr/0513 index 97b0e5ad0..ac63399e7 100644 --- a/test/stderr/0513 +++ b/test/stderr/0513 @@ -6,21 +6,16 @@ >>> 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: >>> a.b.c.d in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> a.b.c.d in helo_lookup_domains? no (end of list) ->>> 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 "check_rcpt" >>> processing "defer" (TESTSUITE/test-config 19) >>> check !verify = recipient diff --git a/test/stderr/0524 b/test/stderr/0524 index b9a77b346..f515c0622 100644 --- a/test/stderr/0524 +++ b/test/stderr/0524 @@ -6,21 +6,16 @@ >>> 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: >>> csa1.test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> csa1.test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_mail" >>> processing "accept" (TESTSUITE/test-config 18) >>> message: CSA status is $csa_status @@ -34,15 +29,12 @@ >>> list element: @ >>> list element: @[] >>> csa2.test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_mail" >>> processing "accept" (TESTSUITE/test-config 18) >>> message: CSA status is $csa_status @@ -58,21 +50,16 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization >>> 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: >>> csa1.test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] >>> csa1.test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_mail" >>> processing "accept" (TESTSUITE/test-config 18) >>> message: CSA status is $csa_status @@ -87,15 +74,12 @@ LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization >>> list element: @ >>> list element: @[] >>> csa2.test.ex in helo_lookup_domains? no (end of list) ->>> 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 "check_mail" >>> processing "accept" (TESTSUITE/test-config 18) >>> message: CSA status is $csa_status diff --git a/test/stderr/0534 b/test/stderr/0534 index a9769d283..0cbbcca2b 100644 --- a/test/stderr/0534 +++ b/test/stderr/0534 @@ -14,5 +14,3 @@ >>> host in "5.6.7.8"? yes (matched "5.6.7.8") >>> accept: condition test succeeded in ACL "two" >>> end of ACL "two": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: diff --git a/test/stderr/0537 b/test/stderr/0537 index 16e2846f4..21c744c9e 100644 --- a/test/stderr/0537 +++ b/test/stderr/0537 @@ -43,8 +43,6 @@ LOG: sender_ident= >>> end of ACL "log": ACCEPT >>> accept: condition test succeeded in ACL "connect" >>> end of ACL "connect": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -88,17 +86,12 @@ LOG: sender_ident=ident >>> end of ACL "log": ACCEPT >>> accept: condition test succeeded in ACL "connect" >>> end of ACL "connect": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: ->>> 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 "mail" >>> processing "accept" (TESTSUITE/test-config 27) >>> check acl = log diff --git a/test/stderr/0547 b/test/stderr/0547 index 009149810..791a7298c 100644 --- a/test/stderr/0547 +++ b/test/stderr/0547 @@ -6,8 +6,6 @@ >>> 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: >>> rhu.barb in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -15,13 +13,6 @@ >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") ->>> host in tls_advertise_hosts? ->>> host in tls_advertise_hosts? ->>> host in tls_advertise_hosts? ->>> host in tls_advertise_hosts? ->>> host in tls_advertise_hosts? ->>> host in tls_advertise_hosts? ->>> host in tls_advertise_hosts? LOG: no MAIL in SMTP connection from (rhu.barb) [10.9.8.7] D=qqs C=...HELP,RSET,NOOP,HELP,RSET,NOOP,HELP,RSET,NOOP,HELP,RSET,NOOP,HELP,RSET,NOOP,HELP,RSET,NOOP,HELP,QUIT >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) @@ -31,8 +22,6 @@ LOG: no MAIL in SMTP connection from (rhu.barb) [10.9.8.7] D=qqs C=...HELP,RSET, >>> 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: >>> rhu.barb in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -40,9 +29,6 @@ LOG: no MAIL in SMTP connection from (rhu.barb) [10.9.8.7] D=qqs C=...HELP,RSET, >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") ->>> host in tls_advertise_hosts? ->>> host in tls_advertise_hosts? ->>> host in tls_advertise_hosts? LOG: SMTP call from (rhu.barb) [10.9.8.7] dropped: too many nonmail commands (last was "HELP") LOG: no MAIL in SMTP connection from (rhu.barb) [10.9.8.7] D=qqs C=HELO,RSET,NOOP,HELP,RSET,NOOP,HELP,RSET,NOOP,HELP,RSET,NOOP diff --git a/test/stderr/0569 b/test/stderr/0569 index 813af1523..01c249b0a 100644 --- a/test/stderr/0569 +++ b/test/stderr/0569 @@ -8,8 +8,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -47,8 +45,6 @@ LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=s >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -84,8 +80,6 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -123,8 +117,6 @@ LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<usery@exim.test.ex> rejected >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -160,8 +152,6 @@ LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -199,8 +189,6 @@ LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=s >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0575 b/test/stderr/0575 index 81876ae3d..f70f19cd1 100644 --- a/test/stderr/0575 +++ b/test/stderr/0575 @@ -20,8 +20,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test diff --git a/test/stderr/0584 b/test/stderr/0584 index 3d388bc63..28ec3e523 100644 --- a/test/stderr/0584 +++ b/test/stderr/0584 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -37,8 +35,6 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -65,8 +61,6 @@ LOG: H=(test) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sende >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0587 b/test/stderr/0587 index 829ae9adc..3f9d2b5d6 100644 --- a/test/stderr/0587 +++ b/test/stderr/0587 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0588 b/test/stderr/0588 index cb7d945e3..e1f5d4f29 100644 --- a/test/stderr/0588 +++ b/test/stderr/0588 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -34,8 +32,6 @@ LOG: Long A lookup for 'delay1500.test.ex': ssss msec >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0618 b/test/stderr/0618 index 6b4ab92f9..3660861ce 100644 --- a/test/stderr/0618 +++ b/test/stderr/0618 @@ -6,8 +6,6 @@ >>> 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: >>> tester in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0626 b/test/stderr/0626 index e34a8f7f0..025f190a7 100644 --- a/test/stderr/0626 +++ b/test/stderr/0626 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -27,8 +25,6 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -46,8 +42,6 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -66,8 +60,6 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -87,8 +79,6 @@ LOG: H=(test) [ip4.ip4.ip4.ip4] F=<tester@test.ex> rejected RCPT <a1@test.ex> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -109,8 +99,6 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -129,8 +117,6 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -150,8 +136,6 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -172,8 +156,6 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex> >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/0633 b/test/stderr/0633 index 8d92d2ed7..0bf24f020 100644 --- a/test/stderr/0633 +++ b/test/stderr/0633 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/1000 b/test/stderr/1000 index 97e99b951..f1a1de6a4 100644 --- a/test/stderr/1000 +++ b/test/stderr/1000 @@ -20,8 +20,6 @@ LOG: H=[2001:0ab8:037f:0020:0000:0000:0000:0001] Warning: matched hostlist >>> = true >>> accept: condition test succeeded in ACL "check_connect" >>> end of ACL "check_connect": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? >>> list element: * diff --git a/test/stderr/1002 b/test/stderr/1002 index 328732e47..cd8cae71f 100644 --- a/test/stderr/1002 +++ b/test/stderr/1002 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/2002 b/test/stderr/2002 index b5ffa1330..59f338294 100644 --- a/test/stderr/2002 +++ b/test/stderr/2002 @@ -6,7 +6,5 @@ >>> 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: ******** SERVER ******** diff --git a/test/stderr/2102 b/test/stderr/2102 index b5ffa1330..59f338294 100644 --- a/test/stderr/2102 +++ b/test/stderr/2102 @@ -6,7 +6,5 @@ >>> 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: ******** SERVER ******** diff --git a/test/stderr/2132 b/test/stderr/2132 index 7239c8052..6babd94f1 100644 --- a/test/stderr/2132 +++ b/test/stderr/2132 @@ -10,8 +10,6 @@ >>> 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: ******** SERVER ******** ### Should accept message diff --git a/test/stderr/2202 b/test/stderr/2202 index 3b04a9283..8c2da8190 100644 --- a/test/stderr/2202 +++ b/test/stderr/2202 @@ -20,8 +20,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test @@ -128,8 +126,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< vrfy a@test.again.dns diff --git a/test/stderr/2600 b/test/stderr/2600 index 2e9995613..da02c5815 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -159,8 +159,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test @@ -289,8 +287,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test @@ -419,8 +415,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test diff --git a/test/stderr/2610 b/test/stderr/2610 index dd5def7d2..7dd4b2953 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -252,8 +252,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test diff --git a/test/stderr/2620 b/test/stderr/2620 index 8ad987d4f..2674d9e1d 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -238,8 +238,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test diff --git a/test/stderr/3000 b/test/stderr/3000 index 2dfce2bfb..45103c44a 100644 --- a/test/stderr/3000 +++ b/test/stderr/3000 @@ -76,8 +76,6 @@ LOG: smtp_connection MAIN >>> 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: >>> x.y.z in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -88,7 +86,6 @@ LOG: smtp_connection MAIN >>> 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 "check_rcpt" >>> processing "accept" (TESTSUITE/test-config 20) LOG: this is a warning at TESTSUITE/aux-fixed/3000.pl line 25. diff --git a/test/stderr/3202 b/test/stderr/3202 index 94c7d5ab9..35d861b31 100644 --- a/test/stderr/3202 +++ b/test/stderr/3202 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -28,8 +26,6 @@ LOG: H=(test) [1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup f >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -50,8 +46,6 @@ LOG: H=(test) [1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup f >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/3204 b/test/stderr/3204 index d701ddb1f..a0c1916be 100644 --- a/test/stderr/3204 +++ b/test/stderr/3204 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/3205 b/test/stderr/3205 index 47d983fac..3bbbec06d 100644 --- a/test/stderr/3205 +++ b/test/stderr/3205 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -28,8 +26,6 @@ LOG: H=(test) [1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <us >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/3208 b/test/stderr/3208 index 2cdc95c40..65f28b8fc 100644 --- a/test/stderr/3208 +++ b/test/stderr/3208 @@ -6,8 +6,6 @@ >>> 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: >>> remote.host in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -18,7 +16,6 @@ >>> 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? >>> test.ex in percent_hack_domains? >>> list element: !*relay.ex >>> list element: !test.ex diff --git a/test/stderr/3211 b/test/stderr/3211 index c508ef83a..54f791dc4 100644 --- a/test/stderr/3211 +++ b/test/stderr/3211 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -38,8 +36,6 @@ LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test. >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/3400 b/test/stderr/3400 index 3d983bd4d..b19b82bee 100644 --- a/test/stderr/3400 +++ b/test/stderr/3400 @@ -16,8 +16,6 @@ >>> processing "accept" (TESTSUITE/test-config 34) >>> accept: condition test succeeded in ACL "check_connect" >>> end of ACL "check_connect": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -118,8 +116,6 @@ LOG: H=(test) [10.0.0.2] Warning: accepted ETRN #abcd >>> processing "accept" (TESTSUITE/test-config 34) >>> accept: condition test succeeded in ACL "check_connect" >>> end of ACL "check_connect": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> test.host in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -136,7 +132,6 @@ LOG: H=(test) [10.0.0.2] Warning: accepted ETRN #abcd >>> host in auth_advertise_hosts? yes (matched "+auth_hosts") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? >>> host in smtp_accept_max_nonmail_hosts? >>> list element: * >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") @@ -417,8 +412,6 @@ LOG: H=(test.host) [10.0.0.1] Warning: accepted ETRN #abcd >>> processing "accept" (TESTSUITE/test-config 34) >>> accept: condition test succeeded in ACL "check_connect" >>> end of ACL "check_connect": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> test.host in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -443,7 +436,6 @@ LOG: H=(test.host) [10.0.0.1] Warning: accepted ETRN #abcd >>> host in auth_advertise_hosts? yes (matched "+auth_relay_hosts") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? >>> using ACL "check_recipient" >>> processing "warn" (TESTSUITE/test-config 37) >>> check hosts = 10.0.0.5 @@ -571,8 +563,6 @@ LOG: H=(test.host) [10.0.0.3] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cu >>> processing "accept" (TESTSUITE/test-config 34) >>> accept: condition test succeeded in ACL "check_connect" >>> end of ACL "check_connect": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> test.host in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -593,7 +583,6 @@ LOG: H=(test.host) [10.0.0.3] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cu >>> host in auth_advertise_hosts? no (matched "!+relay_hosts") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 @@ -633,8 +622,6 @@ warn: condition test failed in ACL "check_connect" processing "accept" (TESTSUITE/test-config 34) accept: condition test succeeded in ACL "check_connect" end of ACL "check_connect": ACCEPT -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< ehlo testing.testing @@ -680,7 +667,6 @@ Evaluating advertise_condition for defer DEFER athenticator Evaluating advertise_condition for login LOGIN athenticator host in chunking_advertise_hosts? host in chunking_advertise_hosts? no (end of list) -host in tls_advertise_hosts? SMTP>> 250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5] 250-SIZE 52428800 250-8BITMIME diff --git a/test/stderr/3408 b/test/stderr/3408 index c4039e6cc..ad2564734 100644 --- a/test/stderr/3408 +++ b/test/stderr/3408 @@ -6,8 +6,6 @@ >>> 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: >>> exim.test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -21,7 +19,6 @@ >>> host in auth_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 "check_recipient" >>> processing "accept" (TESTSUITE/test-config 18) >>> check hosts = : @@ -74,8 +71,6 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1 >>> 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: >>> exim.test.ex in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -89,7 +84,6 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1 >>> host in auth_advertise_hosts? yes (matched "*") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? >>> plain authenticator server_condition: >>> $auth1 = >>> $auth2 = userx diff --git a/test/stderr/3410 b/test/stderr/3410 index 448c6b969..81e1e5b21 100644 --- a/test/stderr/3410 +++ b/test/stderr/3410 @@ -6,8 +6,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -35,7 +33,6 @@ LOG: H=(test) [5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate >>> host in auth_advertise_hosts? yes (matched "*") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? >>> auth1 authenticator server_condition: >>> $auth1 = >>> $auth2 = userx @@ -61,8 +58,6 @@ LOG: H=(test) [5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -89,7 +84,6 @@ LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y> >>> host in auth_advertise_hosts? yes (matched "*") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? >>> auth1 authenticator server_condition: >>> $auth1 = >>> $auth2 = userx @@ -114,8 +108,6 @@ LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y> >>> 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: >>> rhu.barb in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -129,7 +121,6 @@ LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y> >>> host in auth_advertise_hosts? yes (matched "*") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? >>> auth2 authenticator server_condition: >>> $auth1 = userx >>> $auth2 = secret diff --git a/test/stderr/3500 b/test/stderr/3500 index 244955b10..937595786 100644 --- a/test/stderr/3500 +++ b/test/stderr/3500 @@ -6,8 +6,6 @@ >>> 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: >>> test.host in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -29,7 +27,6 @@ >>> host in auth_advertise_hosts? no (matched "!+relay_hosts") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -38,8 +35,6 @@ >>> 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: >>> test.host in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -56,7 +51,6 @@ >>> host in auth_advertise_hosts? yes (matched "+auth_hosts") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3="" >>> CRAM-MD5: user name = tim >>> challenge = <1896.697170952@postoffice.reston.mci.net> @@ -117,8 +111,6 @@ LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=c >>> 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: >>> test.host in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -136,7 +128,6 @@ LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=c >>> host in auth_advertise_hosts? yes (matched "+auth_hosts") >>> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) ->>> host in tls_advertise_hosts? >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3="" >>> CRAM-MD5: user name = tim >>> challenge = <1896.697170952@postoffice.reston.mci.net> diff --git a/test/stderr/4001 b/test/stderr/4001 index 6646220eb..df9611573 100644 --- a/test/stderr/4001 +++ b/test/stderr/4001 @@ -6,8 +6,6 @@ >>> 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: @[] @@ -18,7 +16,6 @@ >>> 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) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT diff --git a/test/stderr/4031 b/test/stderr/4031 index 03da8b266..b877f2e39 100644 --- a/test/stderr/4031 +++ b/test/stderr/4031 @@ -8,8 +8,6 @@ >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> list element: ip4.ip4.ip4.ip4 ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> clientname in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -47,8 +45,6 @@ LOG: 10HmaX-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2] P=smtp S=sss >>> list element: ip4.ip4.ip4.ip4 >>> looking up host name for 127.0.0.2 LOG: no host name found for IP address 127.0.0.2 ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> clientname in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -86,8 +82,6 @@ LOG: 10HmaY-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2]:1113 P=smtp PRX=ip >>> list element: ip4.ip4.ip4.ip4 >>> looking up host name for 127.0.0.2 LOG: no host name found for IP address 127.0.0.2 ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> clientname in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -123,8 +117,6 @@ LOG: 10HmaZ-0005vi-00 <= a@test.ex H=(clientname) [127.0.0.2]:1115 P=smtp PRX=ip >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> list element: ip4.ip4.ip4.ip4 ->>> host in pipelining_connect_advertise_hosts? ->>> list element: ******** SERVER ******** ### non-prox plain receive diff --git a/test/stderr/4507 b/test/stderr/4507 index c43329779..bded5b697 100644 --- a/test/stderr/4507 +++ b/test/stderr/4507 @@ -8,8 +8,6 @@ >>> 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: >>> xxx in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/5204 b/test/stderr/5204 index 5392b0419..0a45e2047 100644 --- a/test/stderr/5204 +++ b/test/stderr/5204 @@ -238,8 +238,6 @@ host in recipient_unqualified_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) -host in pipelining_connect_advertise_hosts? - list element: some.name in helo_lookup_domains? list element: @ list element: @[] @@ -250,7 +248,6 @@ host in pipelining_advertise_hosts? 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 79) check verify = recipient >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> diff --git a/test/stderr/5403 b/test/stderr/5403 index 9426e4d66..1858fcd59 100644 --- a/test/stderr/5403 +++ b/test/stderr/5403 @@ -6,8 +6,6 @@ >>> 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 "@") @@ -19,7 +17,6 @@ LOG: no host name found for IP address 1.2.3.4 >>> 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 @@ -43,8 +40,6 @@ 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 "@") @@ -56,7 +51,6 @@ LOG: no host name found for IP address 1.2.3.4 >>> 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 diff --git a/test/stderr/5820 b/test/stderr/5820 index 7cc0b5f76..717fe93ce 100644 --- a/test/stderr/5820 +++ b/test/stderr/5820 @@ -9,8 +9,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] diff --git a/test/stderr/5840 b/test/stderr/5840 index 39f0a1bc9..e217f1502 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -9,8 +9,6 @@ >>> 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: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] |