From 1b7cf216d933b395dee691f05becca4dd44b26f7 Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Wed, 4 Oct 2017 22:25:45 +0200 Subject: Check for proper output separator in expanding ${addresses:STRING} (Closes 2171) Better yet would be to force setting the output separator literally, and not after expansion of the STRING. But this would be an incompatible change. --- test/scripts/0000-Basic/0002 | 1 + 1 file changed, 1 insertion(+) (limited to 'test/scripts') diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002 index cb0bb188f..dd9cea255 100644 --- a/test/scripts/0000-Basic/0002 +++ b/test/scripts/0000-Basic/0002 @@ -133,6 +133,7 @@ addresses: ${addresses:>+ Exim Person (that's me),\ addresses: ${addresses:Exim Person (that's me), \ xyz@abc, nullgroupname:;, group: p@q, r@s; } addresses: ${addresses:local-part@dom.ain } +addresses: ${addresses:>} escape: ${escape:B7·F2ò} excape8bit: ${escape8bit:undisturbed text\ttab\nnewline\ttab\\backslash \176tilde\177DEL\200\x81.} -- cgit v1.2.3 From d0eb2d4579a562f40f4c36b22d47c0225f61b667 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 6 Oct 2017 22:58:39 +0100 Subject: Testsuite: accept different debug detail for peer-terminated connection --- test/runtest | 3 +++ test/scripts/0000-Basic/0476 | 1 + 2 files changed, 4 insertions(+) (limited to 'test/scripts') diff --git a/test/runtest b/test/runtest index 3bd6c77bd..eac861671 100755 --- a/test/runtest +++ b/test/runtest @@ -1549,6 +1549,9 @@ $munges = 'timeout_errno' => # actual errno differs Solaris vs. Linux { 'mainlog' => 's/(host deferral .* errno) <\d+> /$1 /' }, + + 'peer_terminated_conn' => # actual error differs FreedBSD vs. Linux + { 'stderr' => 's/^( SMTP\()Connection reset by peer(\)<<)$/$1closed$2/' }, }; diff --git a/test/scripts/0000-Basic/0476 b/test/scripts/0000-Basic/0476 index a7ddb0f4b..b068a16a0 100644 --- a/test/scripts/0000-Basic/0476 +++ b/test/scripts/0000-Basic/0476 @@ -1,4 +1,5 @@ # RSET error for multiple messages +munge peer_terminated_conn need_ipv4 # exim -odi -odqs userx@test.ex -- cgit v1.2.3 From 9e0ed81fc2a821e60dd3235c4e5598ab45cfcc1e Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 8 Oct 2017 18:56:13 +0100 Subject: Logging: show when input from truncated for logging "next input sent too soon" --- doc/doc-txt/ChangeLog | 3 +++ src/src/smtp_in.c | 9 +++++---- test/log/0901 | 2 +- test/rejectlog/0901 | 2 +- test/scripts/0000-Basic/0901 | 6 +----- test/stdout/0901 | 6 +----- 6 files changed, 12 insertions(+), 16 deletions(-) (limited to 'test/scripts') diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 8f1b6b7ad..5266cefc4 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -166,6 +166,9 @@ HS/02 Fix Bug 2130: large writes from the transport subprocess where chunked JH/27 Fix SOCKS bug: an unitialized pointer was deref'd by the transport process which could crash as a result. This could lead to undeliverable messages. +JH/28 Logging: "next input sent too soon" now shows where input was truncated + for log purposes. + Exim version 4.89 ----------------- diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 0f8d5599b..9847c86c7 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -565,11 +565,12 @@ for(;;) incomplete_transaction_log(US"sync failure"); log_write(0, LOG_MAIN|LOG_REJECT, "SMTP protocol synchronization error " "(next input sent too soon: pipelining was not advertised): " - "rejected \"%s\" %s next input=\"%s\"", + "rejected \"%s\" %s next input=\"%s\"%s", smtp_cmd_buffer, host_and_ident(TRUE), - string_printing(string_copyn(smtp_inptr, n))); - (void) synprot_error(L_smtp_protocol_error, 554, NULL, - US"SMTP synchronization error"); + string_printing(string_copyn(smtp_inptr, n)), + smtp_inend - smtp_inptr > n ? "..." : ""); + (void) synprot_error(L_smtp_protocol_error, 554, NULL, + US"SMTP synchronization error"); goto repeat_until_rset; } diff --git a/test/log/0901 b/test/log/0901 index 0297a8915..0f876740f 100644 --- a/test/log/0901 +++ b/test/log/0901 @@ -10,6 +10,6 @@ 1999-03-02 09:44:33 SMTP connection from (tester) [127.0.0.1] lost while reading message data 1999-03-02 09:44:33 SMTP connection from (tester) [127.0.0.1] lost while reading message data 1999-03-02 09:44:33 10HmbD-0005vi-00 <= someone8@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex -1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "BDAT 1" H=(tester) [127.0.0.1] next input="BDAT 87 last\r\n" +1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "BDAT 1" H=(tester) [127.0.0.1] next input="BDAT 87 last\r\no: Susan@random.co"... 1999-03-02 09:44:33 SMTP call from (tester) [127.0.0.1] dropped: too many syntax or protocol errors (last command was "From: Sam@random.com") 1999-03-02 09:44:33 SMTP connection from (tester) [127.0.0.1] lost while reading message data (header) diff --git a/test/rejectlog/0901 b/test/rejectlog/0901 index f75d9d270..a4185a966 100644 --- a/test/rejectlog/0901 +++ b/test/rejectlog/0901 @@ -1,6 +1,6 @@ ******** SERVER ******** -1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "BDAT 1" H=(tester) [127.0.0.1] next input="BDAT 87 last\r\n" +1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "BDAT 1" H=(tester) [127.0.0.1] next input="BDAT 87 last\r\no: Susan@random.co"... Envelope-from: Envelope-to: 1999-03-02 09:44:33 SMTP call from (tester) [127.0.0.1] dropped: too many syntax or protocol errors (last command was "From: Sam@random.com") diff --git a/test/scripts/0000-Basic/0901 b/test/scripts/0000-Basic/0901 index 5e88c5ae9..f5a6fff9a 100644 --- a/test/scripts/0000-Basic/0901 +++ b/test/scripts/0000-Basic/0901 @@ -247,11 +247,7 @@ MAIL FROM:someone9@some.domain ??? 250 RCPT TO:CALLER@test.ex ??? 250 -BDAT 1\r\nTBDAT 87 last -o: Susan@random.com -From: Sam@random.com -Subject: This is a bodyless test message - +BDAT 1\r\nTBDAT 87 last\r\no: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n\r\n ??? 554 SMTP synchronization error **** # diff --git a/test/stdout/0901 b/test/stdout/0901 index a982ac8b6..c4020ae5f 100644 --- a/test/stdout/0901 +++ b/test/stdout/0901 @@ -330,11 +330,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> RCPT TO:CALLER@test.ex ??? 250 <<< 250 Accepted ->>> BDAT 1\r\nTBDAT 87 last ->>> o: Susan@random.com ->>> From: Sam@random.com ->>> Subject: This is a bodyless test message ->>> +>>> BDAT 1\r\nTBDAT 87 last\r\no: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n\r\n ??? 554 SMTP synchronization error <<< 554 SMTP synchronization error End of script -- cgit v1.2.3 From 131c0f8aad2e08201a3977401f15dfd2b5127b69 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 13 Oct 2017 17:05:59 +0100 Subject: Testsuite: add cipher-suite seen on OpenBSD --- test/confs/2102 | 4 +++- test/confs/2119 | 3 ++- test/confs/2132 | 3 ++- test/runtest | 2 +- test/scripts/2100-OpenSSL/2102 | 6 +++++- test/scripts/2100-OpenSSL/2132 | 3 +++ test/stdout/2102 | 6 +++++- 7 files changed, 21 insertions(+), 6 deletions(-) (limited to 'test/scripts') diff --git a/test/confs/2102 b/test/confs/2102 index 8b2083959..58ff6fbaa 100644 --- a/test/confs/2102 +++ b/test/confs/2102 @@ -40,7 +40,9 @@ check_recipient: DHE_RSA_AES_256_CBC_SHA1 : \ DHE_RSA_3DES_EDE_CBC_SHA : \ ECDHE-RSA-AES256-GCM-SHA384 : \ - ECDHE-RSA-AES128-GCM-SHA256 + ECDHE-RSA-AES128-GCM-SHA256 : \ + ECDHE-RSA-CHACHA20-POLY1305 + logwrite = cipher: $tls_in_cipher warn logwrite = ${if def:tls_in_ourcert \ {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \ {We did not present a cert}} diff --git a/test/confs/2119 b/test/confs/2119 index 26ae4c1bc..d55232d05 100644 --- a/test/confs/2119 +++ b/test/confs/2119 @@ -39,7 +39,8 @@ check_recipient: DHE_RSA_AES_256_CBC_SHA1:\ DHE_RSA_3DES_EDE_CBC_SHA:\ ECDHE-RSA-AES256-GCM-SHA384:\ - ECDHE-RSA-AES128-GCM-SHA256 + ECDHE-RSA-AES128-GCM-SHA256:\ + ECDHE-RSA-CHACHA20-POLY1305 accept diff --git a/test/confs/2132 b/test/confs/2132 index 7fb561bdc..7e491b8a6 100644 --- a/test/confs/2132 +++ b/test/confs/2132 @@ -39,7 +39,8 @@ check_recipient: DHE_RSA_AES_256_CBC_SHA1 : \ DHE_RSA_3DES_EDE_CBC_SHA : \ ECDHE-RSA-AES256-GCM-SHA384 : \ - ECDHE-RSA-AES128-GCM-SHA256 + ECDHE-RSA-AES128-GCM-SHA256 : \ + ECDHE-RSA-CHACHA20-POLY1305 warn logwrite = ${if def:tls_in_ourcert \ {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \ {We did not present a cert}} diff --git a/test/runtest b/test/runtest index 0a514ad65..57526db19 100755 --- a/test/runtest +++ b/test/runtest @@ -906,7 +906,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/CONNECT_CR_FINISHED/ssl3_read_bytes/i; s/^\d+:error:\d+(?:E\d+)?(:SSL routines:ssl3_read_bytes:[^:]+:).*(:SSL alert number \d\d)$/pppp:error:dddddddd$1\[...\]$2/; - s/^(TLS error on connection .*):func\(4095:\)(No such file or directory)$/$1:fopen:/; + s/^(TLS error on connection .*):func\(4095\):(No such file or directory)$/$1:fopen:$2/; # gnutls version variances next if /^Error in the pull function./; diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102 index cbb9ce393..bdf5496f6 100644 --- a/test/scripts/2100-OpenSSL/2102 +++ b/test/scripts/2100-OpenSSL/2102 @@ -47,6 +47,7 @@ This is a test encrypted message. quit ??? 221 **** +# nonloop addr conn rejected lacking cert client-ssl HOSTIPV4 PORT_D ??? 220 ehlo rhu.barb @@ -57,7 +58,10 @@ ehlo rhu.barb ??? 250- ??? 250 starttls -??? 220 +??? 220 TLS go ahead ++++ 1 +help +??? 554 **** client-ssl HOSTIPV4 PORT_D DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key ??? 220 diff --git a/test/scripts/2100-OpenSSL/2132 b/test/scripts/2100-OpenSSL/2132 index 620a63f57..4a12fb0bb 100644 --- a/test/scripts/2100-OpenSSL/2132 +++ b/test/scripts/2100-OpenSSL/2132 @@ -58,6 +58,9 @@ ehlo rhu.barb ??? 250 starttls ??? 220 ++++ 1 +help +??? 554 **** client-ssl HOSTIPV4 PORT_D DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key ??? 220 diff --git a/test/stdout/2102 b/test/stdout/2102 index 0d96d1279..2df808595 100644 --- a/test/stdout/2102 +++ b/test/stdout/2102 @@ -93,11 +93,15 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ??? 250 <<< 250 HELP >>> starttls -??? 220 +??? 220 TLS go ahead <<< 220 TLS go ahead Attempting to start TLS pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40 Failed to start TLS ++++ 1 +>>> help +??? 554 +<<< 554 Security failure End of script Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected Certificate file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem -- cgit v1.2.3 From 62970272415a2245662287d2e624ace994a1bc19 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 14 Oct 2017 21:53:10 +0100 Subject: Testsuite: avoid indeterminate delivery ordering --- test/confs/2038 | 1 + test/confs/2138 | 1 + test/log/2038 | 1 - test/log/2138 | 1 - test/scripts/2000-GnuTLS/2038 | 1 - test/scripts/2100-OpenSSL/2138 | 1 - 6 files changed, 2 insertions(+), 4 deletions(-) (limited to 'test/scripts') diff --git a/test/confs/2038 b/test/confs/2038 index 140819433..d5465e30d 100644 --- a/test/confs/2038 +++ b/test/confs/2038 @@ -14,6 +14,7 @@ log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients queue_only queue_run_in_order +remote_max_parallel = 1 smtp_accept_max_nonmail = 0 diff --git a/test/confs/2138 b/test/confs/2138 index d6d7604d8..7fec82541 100644 --- a/test/confs/2138 +++ b/test/confs/2138 @@ -14,6 +14,7 @@ log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients queue_only queue_run_in_order +remote_max_parallel = 1 smtp_accept_max_nonmail = 0 diff --git a/test/log/2038 b/test/log/2038 index b3dfed849..1ffc1aa92 100644 --- a/test/log/2038 +++ b/test/log/2038 @@ -1,4 +1,3 @@ -**NOTE: The delivery lines in this file have been sorted. 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx0@test.ex userx1@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery0@test.ex usery1@test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz0@test.ex userz1@test.ex diff --git a/test/log/2138 b/test/log/2138 index 6bc8e0284..6e82af290 100644 --- a/test/log/2138 +++ b/test/log/2138 @@ -1,4 +1,3 @@ -**NOTE: The delivery lines in this file have been sorted. 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx0@test.ex userx1@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery0@test.ex usery1@test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz0@test.ex userz1@test.ex diff --git a/test/scripts/2000-GnuTLS/2038 b/test/scripts/2000-GnuTLS/2038 index 83259d998..650286814 100644 --- a/test/scripts/2000-GnuTLS/2038 +++ b/test/scripts/2000-GnuTLS/2038 @@ -16,4 +16,3 @@ exim -qqf killdaemon exim -DSERVER=server -DNOTDAEMON -qf **** -sortlog diff --git a/test/scripts/2100-OpenSSL/2138 b/test/scripts/2100-OpenSSL/2138 index 3a94a1f2e..79eaa2f31 100644 --- a/test/scripts/2100-OpenSSL/2138 +++ b/test/scripts/2100-OpenSSL/2138 @@ -15,4 +15,3 @@ exim -qqf killdaemon exim -DSERVER=server -DNOTDAEMON -qf **** -sortlog -- cgit v1.2.3 From c3161b1d1507995f38347adcd533b4a74c10b00f Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 20 Oct 2017 16:21:32 +0100 Subject: Testsuite: ignore optional-config output --- test/runtest | 9 ++++++--- test/scripts/3000-Perl/3000 | 1 + test/stderr/0402 | 16 +++++++-------- test/stderr/0544 | 16 +++++++-------- test/stderr/5410 | 48 ++++++++++++++++++++++----------------------- test/stderr/5420 | 48 ++++++++++++++++++++++----------------------- test/stdout/0572 | 1 - 7 files changed, 71 insertions(+), 68 deletions(-) (limited to 'test/scripts') diff --git a/test/runtest b/test/runtest index 71ee0f68e..d8c64eabc 100755 --- a/test/runtest +++ b/test/runtest @@ -1082,7 +1082,7 @@ RESET_AFTER_EXTRA_LINE_READ: if (s/(with \$received_protocol)\}\} \$\{if def:tls_cipher \{\(\$tls_cipher\)\n$/$1/) { $_ .= ; - s/\s+\}\}(?=\(Exim )/\}\} /; + s/[ â•Ž]+\}\}(?=\(Exim )/\}\} /; } if (/^ condition: def:tls_cipher$/) { @@ -1535,10 +1535,11 @@ $munges = dkim_(canon|domain|private_key|selector|sign_headers|strict|hash|identity) |gnutls_require_(kx|mac|protocols) |hosts_(requ(est|ire)|try)_(dane|ocsp) - |hosts_(avoid|nopass|require|verify_avoid)_tls + |hosts_(avoid|nopass|noproxy|require|verify_avoid)_tls |socks_proxy |tls_[^ ]* - )($|[ ]=)/x' }, + )($|[ ]=)/x' + }, 'sys_bindir' => { 'mainlog' => 's%/(usr/(local/)?)?bin/%SYSBINDIR/%' }, @@ -1557,6 +1558,8 @@ $munges = 'peer_terminated_conn' => # actual error differs FreedBSD vs. Linux { 'stderr' => 's/^( SMTP\()Connection reset by peer(\)<<)$/$1closed$2/' }, + + 'perl_variants' }; diff --git a/test/scripts/3000-Perl/3000 b/test/scripts/3000-Perl/3000 index 30ac29eb3..60db492ad 100644 --- a/test/scripts/3000-Perl/3000 +++ b/test/scripts/3000-Perl/3000 @@ -1,4 +1,5 @@ # Embedded Perl +munge perl_variants exim -be ${perl{foo}} ${perl{foo}{arg1}} diff --git a/test/stderr/0402 b/test/stderr/0402 index eae68a2b0..84f43ad7e 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -46,7 +46,7 @@ Data file written for message 10HmaX-0005vi-00 └─────result: Tue, 2 Mar 1999 09:44:33 +0000 ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -54,7 +54,7 @@ Data file written for message 10HmaX-0005vi-00 ├─────result: false ┌───scanning: from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -64,19 +64,19 @@ Data file written for message 10HmaX-0005vi-00 └───skipping: result is not used ┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ├──condition: def:sender_ident ├─────result: true ┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž}} (Exim $version_number) + â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž }}(Exim $version_number) â•Ž ${if def:sender_address {(envelope-from <$sender_address>) â•Ž }}id $message_exim_id${if def:received_for { â•Ž for $received_for}} @@ -87,7 +87,7 @@ Data file written for message 10HmaX-0005vi-00 ├──condition: def:sender_helo_name ├─────result: false ┌───scanning: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -101,7 +101,7 @@ Data file written for message 10HmaX-0005vi-00 └─────result: from CALLER ├──condition: def:received_protocol ├─────result: true - ┌considering: with $received_protocol}} (Exim $version_number) + ┌considering: with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -139,7 +139,7 @@ Data file written for message 10HmaX-0005vi-00 └───skipping: result is not used ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} diff --git a/test/stderr/0544 b/test/stderr/0544 index f32cd8886..894ae0fb2 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -6,7 +6,7 @@ admin user └─────result: Tue, 2 Mar 1999 09:44:33 +0000 ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -14,7 +14,7 @@ admin user ├─────result: false ┌───scanning: from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -24,19 +24,19 @@ admin user └───skipping: result is not used ┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ├──condition: def:sender_ident ├─────result: true ┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž}} (Exim $version_number) + â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž }}(Exim $version_number) â•Ž ${if def:sender_address {(envelope-from <$sender_address>) â•Ž }}id $message_exim_id${if def:received_for { â•Ž for $received_for}} @@ -47,7 +47,7 @@ admin user ├──condition: def:sender_helo_name ├─────result: false ┌───scanning: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -61,7 +61,7 @@ admin user └─────result: from CALLER ├──condition: def:received_protocol ├─────result: true - ┌considering: with $received_protocol}} (Exim $version_number) + ┌considering: with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -99,7 +99,7 @@ admin user └───skipping: result is not used ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} diff --git a/test/stderr/5410 b/test/stderr/5410 index b4db690ab..dda1875d7 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -136,7 +136,7 @@ end of inline ACL: ACCEPT └─────result: Tue, 2 Mar 1999 09:44:33 +0000 ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -144,7 +144,7 @@ end of inline ACL: ACCEPT ├─────result: false ┌───scanning: from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -154,19 +154,19 @@ end of inline ACL: ACCEPT └───skipping: result is not used ┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ├──condition: def:sender_ident ├─────result: true ┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž}} (Exim $version_number) + â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž }}(Exim $version_number) â•Ž ${if def:sender_address {(envelope-from <$sender_address>) â•Ž }}id $message_exim_id${if def:received_for { â•Ž for $received_for}} @@ -177,7 +177,7 @@ end of inline ACL: ACCEPT ├──condition: def:sender_helo_name ├─────result: true ┌considering: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -191,7 +191,7 @@ end of inline ACL: ACCEPT ├──condition: def:received_protocol ├─────result: true - ┌considering: with $received_protocol}} (Exim $version_number) + ┌considering: with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -228,7 +228,7 @@ end of inline ACL: ACCEPT for userx@domain.com ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -362,7 +362,7 @@ end of inline ACL: ACCEPT └─────result: Tue, 2 Mar 1999 09:44:33 +0000 ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -370,7 +370,7 @@ end of inline ACL: ACCEPT ├─────result: false ┌───scanning: from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -380,19 +380,19 @@ end of inline ACL: ACCEPT └───skipping: result is not used ┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ├──condition: def:sender_ident ├─────result: true ┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž}} (Exim $version_number) + â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž }}(Exim $version_number) â•Ž ${if def:sender_address {(envelope-from <$sender_address>) â•Ž }}id $message_exim_id${if def:received_for { â•Ž for $received_for}} @@ -403,7 +403,7 @@ end of inline ACL: ACCEPT ├──condition: def:sender_helo_name ├─────result: true ┌considering: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -417,7 +417,7 @@ end of inline ACL: ACCEPT ├──condition: def:received_protocol ├─────result: true - ┌considering: with $received_protocol}} (Exim $version_number) + ┌considering: with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -454,7 +454,7 @@ end of inline ACL: ACCEPT for usery@domain.com ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -588,7 +588,7 @@ end of inline ACL: ACCEPT └─────result: Tue, 2 Mar 1999 09:44:33 +0000 ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -596,7 +596,7 @@ end of inline ACL: ACCEPT ├─────result: false ┌───scanning: from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -606,19 +606,19 @@ end of inline ACL: ACCEPT └───skipping: result is not used ┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ├──condition: def:sender_ident ├─────result: true ┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž}} (Exim $version_number) + â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž }}(Exim $version_number) â•Ž ${if def:sender_address {(envelope-from <$sender_address>) â•Ž }}id $message_exim_id${if def:received_for { â•Ž for $received_for}} @@ -629,7 +629,7 @@ end of inline ACL: ACCEPT ├──condition: def:sender_helo_name ├─────result: true ┌considering: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -643,7 +643,7 @@ end of inline ACL: ACCEPT ├──condition: def:received_protocol ├─────result: true - ┌considering: with $received_protocol}} (Exim $version_number) + ┌considering: with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -680,7 +680,7 @@ end of inline ACL: ACCEPT for usery@domain.com ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} diff --git a/test/stderr/5420 b/test/stderr/5420 index b34440046..0d5ca751f 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -135,7 +135,7 @@ end of inline ACL: ACCEPT └─────result: Tue, 2 Mar 1999 09:44:33 +0000 ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -143,7 +143,7 @@ end of inline ACL: ACCEPT ├─────result: false ┌───scanning: from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -153,19 +153,19 @@ end of inline ACL: ACCEPT └───skipping: result is not used ┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ├──condition: def:sender_ident ├─────result: true ┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž}} (Exim $version_number) + â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž }}(Exim $version_number) â•Ž ${if def:sender_address {(envelope-from <$sender_address>) â•Ž }}id $message_exim_id${if def:received_for { â•Ž for $received_for}} @@ -176,7 +176,7 @@ end of inline ACL: ACCEPT ├──condition: def:sender_helo_name ├─────result: true ┌considering: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -190,7 +190,7 @@ end of inline ACL: ACCEPT ├──condition: def:received_protocol ├─────result: true - ┌considering: with $received_protocol}} (Exim $version_number) + ┌considering: with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -227,7 +227,7 @@ end of inline ACL: ACCEPT for userx@domain.com ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -361,7 +361,7 @@ end of inline ACL: ACCEPT └─────result: Tue, 2 Mar 1999 09:44:33 +0000 ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -369,7 +369,7 @@ end of inline ACL: ACCEPT ├─────result: false ┌───scanning: from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -379,19 +379,19 @@ end of inline ACL: ACCEPT └───skipping: result is not used ┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ├──condition: def:sender_ident ├─────result: true ┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž}} (Exim $version_number) + â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž }}(Exim $version_number) â•Ž ${if def:sender_address {(envelope-from <$sender_address>) â•Ž }}id $message_exim_id${if def:received_for { â•Ž for $received_for}} @@ -402,7 +402,7 @@ end of inline ACL: ACCEPT ├──condition: def:sender_helo_name ├─────result: true ┌considering: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -416,7 +416,7 @@ end of inline ACL: ACCEPT ├──condition: def:received_protocol ├─────result: true - ┌considering: with $received_protocol}} (Exim $version_number) + ┌considering: with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -453,7 +453,7 @@ end of inline ACL: ACCEPT for usery@domain.com ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -587,7 +587,7 @@ end of inline ACL: ACCEPT └─────result: Tue, 2 Mar 1999 09:44:33 +0000 ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -595,7 +595,7 @@ end of inline ACL: ACCEPT ├─────result: false ┌───scanning: from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -605,19 +605,19 @@ end of inline ACL: ACCEPT └───skipping: result is not used ┌considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ├──condition: def:sender_ident ├─────result: true ┌considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž}} (Exim $version_number) + â•Ž }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol â•Ž }}(Exim $version_number) â•Ž ${if def:sender_address {(envelope-from <$sender_address>) â•Ž }}id $message_exim_id${if def:received_for { â•Ž for $received_for}} @@ -628,7 +628,7 @@ end of inline ACL: ACCEPT ├──condition: def:sender_helo_name ├─────result: true ┌considering: (helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -642,7 +642,7 @@ end of inline ACL: ACCEPT ├──condition: def:received_protocol ├─────result: true - ┌considering: with $received_protocol}} (Exim $version_number) + ┌considering: with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -679,7 +679,7 @@ end of inline ACL: ACCEPT for usery@domain.com ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) - }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} diff --git a/test/stdout/0572 b/test/stdout/0572 index 8b7a17a78..96ab5611b 100644 --- a/test/stdout/0572 +++ b/test/stdout/0572 @@ -53,7 +53,6 @@ hosts_avoid_esmtp = hosts_avoid_pipelining = hosts_max_try = 5 hosts_max_try_hardlimit = 50 -hosts_noproxy_tls = * no_hosts_override no_hosts_randomize hosts_require_auth = -- cgit v1.2.3 From a2b558014a3668b734860e296087d7a491628f4b Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 25 Oct 2017 16:59:30 +0100 Subject: Testsuite: more time for slow test platform --- test/scripts/2000-GnuTLS/2030 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/scripts') diff --git a/test/scripts/2000-GnuTLS/2030 b/test/scripts/2000-GnuTLS/2030 index ef7a8dea2..b009d476b 100644 --- a/test/scripts/2000-GnuTLS/2030 +++ b/test/scripts/2000-GnuTLS/2030 @@ -6,5 +6,5 @@ exim -DSERVER=server -bd -oX PORT_D exim CALLER@test.ex Test message. **** -millisleep 500 +sleep 1 killdaemon -- cgit v1.2.3 From 4270f1e68b4cb718f2a3806efa768531c22d509b Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 26 Oct 2017 17:17:22 +0100 Subject: Testsuite: more time for slow test platform --- test/confs/2031 | 2 +- test/log/2031 | 8 ++++---- test/scripts/2000-GnuTLS/2031 | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'test/scripts') diff --git a/test/confs/2031 b/test/confs/2031 index 38713735b..0d9bba640 100644 --- a/test/confs/2031 +++ b/test/confs/2031 @@ -12,7 +12,7 @@ primary_hostname = myhost.test.ex domainlist local_domains = test.ex : *.test.ex acl_smtp_rcpt = acl_log_sni -log_selector = +tls_peerdn +tls_sni +log_selector = +tls_peerdn +tls_sni +received_recipients remote_max_parallel = 1 tls_advertise_hosts = * diff --git a/test/log/2031 b/test/log/2031 index 04b404948..b4d0e0bf6 100644 --- a/test/log/2031 +++ b/test/log/2031 @@ -1,17 +1,17 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@test.ex 1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for abcd@test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 1999-03-02 09:44:33 SNI -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no SNI="fred" S=sss id=E10HmaX-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no SNI="fred" S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 SNI -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no SNI="bill" S=sss id=E10HmaZ-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no SNI="bill" S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for abcd@test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: R=server 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed diff --git a/test/scripts/2000-GnuTLS/2031 b/test/scripts/2000-GnuTLS/2031 index 76186b5e4..d302738fd 100644 --- a/test/scripts/2000-GnuTLS/2031 +++ b/test/scripts/2000-GnuTLS/2031 @@ -6,14 +6,14 @@ exim -DSERVER=server -bd -oX PORT_D exim CALLER@test.ex Test message. **** -millisleep 700 +sleep 1 # # # Extended: server uses SNI to choose certificate exim abcd@test.ex Test message. **** -millisleep 700 +sleep 1 # # killdaemon -- cgit v1.2.3 From f38a45371faa9f914ef69b57cbf1890c609b81cd Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 26 Oct 2017 18:26:37 +0100 Subject: Testsuite: create test db on-the-fliy for LMDB testcase --- test/aux-fixed/2800.lmdb-mkdb-dump.py | 15 --------------- test/aux-fixed/2800.mdb | Bin 12288 -> 0 bytes test/aux-fixed/2800.mdb.src | 3 --- test/scripts/2800-lmdb/2800 | 35 ++++++++++++++++++++++++++-------- 4 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 test/aux-fixed/2800.lmdb-mkdb-dump.py delete mode 100644 test/aux-fixed/2800.mdb delete mode 100644 test/aux-fixed/2800.mdb.src (limited to 'test/scripts') diff --git a/test/aux-fixed/2800.lmdb-mkdb-dump.py b/test/aux-fixed/2800.lmdb-mkdb-dump.py deleted file mode 100644 index 3de6ba13b..000000000 --- a/test/aux-fixed/2800.lmdb-mkdb-dump.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python -import os -import lmdb - -if os.path.exists('2800.mdb'): - os.unlink('2800.mdb') - -env = lmdb.open('2800.mdb', subdir=False); -with env.begin(write=True) as txn: - txn.put('first', 'data for first') - txn.put('second', 'A=1 B=2') - txn.put('third', 'A1:B2:C3') - cursor = txn.cursor() - for key, value in cursor: - print key, "=>", value diff --git a/test/aux-fixed/2800.mdb b/test/aux-fixed/2800.mdb deleted file mode 100644 index 2002ee1b5..000000000 Binary files a/test/aux-fixed/2800.mdb and /dev/null differ diff --git a/test/aux-fixed/2800.mdb.src b/test/aux-fixed/2800.mdb.src deleted file mode 100644 index 957952720..000000000 --- a/test/aux-fixed/2800.mdb.src +++ /dev/null @@ -1,3 +0,0 @@ -first: data for first -second: A=1 B=2 -third: A1:B2:C3 diff --git a/test/scripts/2800-lmdb/2800 b/test/scripts/2800-lmdb/2800 index a074ae628..930f9f2bc 100644 --- a/test/scripts/2800-lmdb/2800 +++ b/test/scripts/2800-lmdb/2800 @@ -1,11 +1,30 @@ # lmdb lookup +# +# prep a test database to work with +perl -e 'chdir "DIR/aux-var"; exec "mdb_load -n DIR/aux-var/TESTNUM.mdb";' +VERSION=3 +format=print +type=btree +mapsize=10485760 +maxreaders=126 +HEADER=END + first + data for first + second + A=1 B=2 + third + A1:B2:C3 +DATA=END +**** +# +# exim -be -${lookup{first}lmdb{DIR/aux-fixed/TESTNUM.mdb}} -${lookup{first}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}fail} -${lookup{fail}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}{failure value}} -${lookup{fail}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}fail} -${lookup{second}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}fail} -${extract{A}{${lookup{second}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}fail}}} -${extract{B}{${lookup{second}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}fail}}} -${extract{C}{${lookup{second}lmdb{DIR/aux-fixed/TESTNUM.mdb}{$value}fail}}{$value}fail} +${lookup{first}lmdb{DIR/aux-var/TESTNUM.mdb}} +${lookup{first}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}fail} +${lookup{fail}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}{failure value}} +${lookup{fail}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}fail} +${lookup{second}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}fail} +${extract{A}{${lookup{second}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}fail}}} +${extract{B}{${lookup{second}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}fail}}} +${extract{C}{${lookup{second}lmdb{DIR/aux-var/TESTNUM.mdb}{$value}fail}}{$value}fail} **** -- cgit v1.2.3