summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/log/05552
-rw-r--r--test/log/40102
-rw-r--r--test/scripts/0000-Basic/000214
-rw-r--r--test/scripts/0000-Basic/05552
-rw-r--r--test/stderr/000220
-rw-r--r--test/stderr/00924
-rw-r--r--test/stderr/03932
-rw-r--r--test/stderr/040244
-rw-r--r--test/stderr/054444
-rw-r--r--test/stderr/45042
-rw-r--r--test/stderr/5410136
-rw-r--r--test/stderr/5420136
-rw-r--r--test/stdout/000214
13 files changed, 274 insertions, 148 deletions
diff --git a/test/log/0555 b/test/log/0555
index e223bd466..29d71cd21 100644
--- a/test/log/0555
+++ b/test/log/0555
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 (= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
diff --git a/test/log/4010 b/test/log/4010
index 1ab5847e6..c1176fee6 100644
--- a/test/log/4010
+++ b/test/log/4010
@@ -1,6 +1,6 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss id=41C2F849.3060203@projectile.test.ex
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=r1 T=t1
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss id=41C2F849.3060203@projectile.test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 (= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss id=41C2F849.3060203@projectile.test.ex
1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002
index 278a38660..dafcba7f0 100644
--- a/test/scripts/0000-Basic/0002
+++ b/test/scripts/0000-Basic/0002
@@ -179,6 +179,20 @@ hex2b64:${hex2b64:1a2b3c4d5e6g}
hex2b64:${hex2b64:${md5:the quick brown fox}}
hex2b64:${hex2b64:${sha1:the quick brown fox}}
+base32: 0 <${base32:0}>
+base32: 1 <${base32:1}>
+base32: 31 <${base32:31}>
+base32: 32 <${base32:32}>
+base32: 42 <${base32:42}>
+base32 error: 0x1 ${base32:0x1}
+
+base32d: 0 ${base32d:${base32:0}}
+base32d: 1 ${base32d:${base32:1}}
+base32d: 31 ${base32d:${base32:31}}
+base32d: 32 ${base32d:${base32:32}}
+base32d: 42 ${base32d:${base32:42}}
+base32d error: ABC ${base32d:ABC}
+
The base62 operator is actually a base36 operator in the Darwin and Cygwin
environments. Write cunning tests that produce the same output in both cases,
while doing a reasonable check.
diff --git a/test/scripts/0000-Basic/0555 b/test/scripts/0000-Basic/0555
index 947f1692d..c35113603 100644
--- a/test/scripts/0000-Basic/0555
+++ b/test/scripts/0000-Basic/0555
@@ -1,4 +1,4 @@
-# Long lines for fakedefer/fakereject
+# Long response lines for fakedefer/fakereject
exim -bs
mail from:<>
rcpt to:<userx@test.ex>
diff --git a/test/stderr/0002 b/test/stderr/0002
index 19ed3479a..317b4bd0a 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -11,8 +11,8 @@ considering: abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
expanding: \N^([ab]+)(\w+)$\N
result: ^([ab]+)(\w+)$
-condition: match{abcd}{\N^([ab]+)(\w+)$\N}
- result: true
+ condition: match{abcd}{\N^([ab]+)(\w+)$\N}
+ result: true
considering: $2$1}fail}
expanding: $2$1
result: cdab
@@ -25,8 +25,8 @@ considering: wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
considering: \N^([ab]+)(\w+)$\N}{$2$1}fail}
expanding: \N^([ab]+)(\w+)$\N
result: ^([ab]+)(\w+)$
-condition: match{wxyz}{\N^([ab]+)(\w+)$\N}
- result: false
+ condition: match{wxyz}{\N^([ab]+)(\w+)$\N}
+ result: false
scanning: $2$1}fail}
expanding: $2$1
result:
@@ -41,8 +41,8 @@ considering: 1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
considering: 1}{yes}{${lookup{xx}lsearch{/non/exist}}}}
expanding: 1
result: 1
-condition: eq {1}{1}
- result: true
+ condition: eq {1}{1}
+ result: true
considering: yes}{${lookup{xx}lsearch{/non/exist}}}}
expanding: yes
result: yes
@@ -69,8 +69,8 @@ considering: a.b.c}{yes}{no}}
result: a.b.c
LOG: MAIN PANIC
no @ found in the subject of an address list match: subject="a.b.c" pattern="a.b.c"
-condition: match_address{a.b.c}{a.b.c}
- result: false
+ condition: match_address{a.b.c}{a.b.c}
+ result: false
scanning: yes}{no}}
expanding: yes
result: yes
@@ -147,8 +147,8 @@ considering: black}{white}{$sender_host_name}{No}}
considering: white}{$sender_host_name}{No}}
expanding: white
result: white
-condition: eq{black}{white}
- result: false
+ condition: eq{black}{white}
+ result: false
scanning: $sender_host_name}{No}}
expanding: $sender_host_name
result:
diff --git a/test/stderr/0092 b/test/stderr/0092
index e763efc0f..197256b81 100644
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -57,8 +57,8 @@ considering: V4NET.0.0.1} {$sender_host_address} {2} {30}}s
considering: $sender_host_address} {2} {30}}s
expanding: $sender_host_address
result: V4NET.0.0.1
-condition: eq {V4NET.0.0.1} {$sender_host_address}
- result: true
+ condition: eq {V4NET.0.0.1} {$sender_host_address}
+ result: true
considering: 2} {30}}s
expanding: 2
result: 2
diff --git a/test/stderr/0393 b/test/stderr/0393
index 673d9e6f9..941e8f89c 100644
--- a/test/stderr/0393
+++ b/test/stderr/0393
@@ -27,7 +27,7 @@ lock file created
mailbox TESTSUITE/test-mail/userx is locked
writing to file TESTSUITE/test-mail/userx
writing data block fd=dddd size=sss timeout=0
-process pppp running as transport filter: fd_write=10 fd_read=11
+process pppp running as transport filter: fd_write=9 fd_read=10
writing data block fd=dddd size=sss timeout=0
process pppp writing to transport filter
copying from the filter
diff --git a/test/stderr/0402 b/test/stderr/0402
index 9f95393f3..24a4fcd4d 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -49,8 +49,8 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
-condition: def:sender_rcvhost
- result: false
+ condition: def:sender_rcvhost
+ 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}} ${if def:tls_cipher {($tls_cipher)
@@ -69,8 +69,8 @@ considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${i
${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
+ 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}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -87,8 +87,8 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name
result: CALLER
expanding: from ${quote_local_part:$sender_ident}
result: from CALLER
-condition: def:sender_helo_name
- result: false
+ condition: def:sender_helo_name
+ result: false
scanning: (helo=$sender_helo_name)
}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -103,8 +103,8 @@ condition: def:sender_helo_name
expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
}}
result: from CALLER
-condition: def:received_protocol
- result: true
+ condition: def:received_protocol
+ result: true
considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
@@ -112,8 +112,20 @@ considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
for $received_for}}
expanding: with $received_protocol
result: with local
-condition: def:sender_address
- result: true
+ condition: def:tls_cipher
+ result: false
+ scanning: ($tls_cipher)
+ }}(Exim $version_number)
+ ${if def:sender_address {(envelope-from <$sender_address>)
+ }}id $message_exim_id${if def:received_for {
+ for $received_for}}
+ expanding: ($tls_cipher)
+
+ result: ()
+
+ skipping: result is not used
+ condition: def:sender_address
+ result: true
considering: (envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@ -121,8 +133,8 @@ considering: (envelope-from <$sender_address>)
result: (envelope-from <CALLER@test.ex>)
-condition: def:received_for
- result: false
+ condition: def:received_for
+ result: false
scanning:
for $received_for}}
expanding:
@@ -465,8 +477,8 @@ mailbox TESTSUITE/test-mail/junk is locked
writing to file TESTSUITE/test-mail/junk
considering: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}
-condition: def:return_path
- result: true
+ condition: def:return_path
+ result: true
considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox}
expanding: $return_path
@@ -520,8 +532,8 @@ mailbox TESTSUITE/test-mail/junk is locked
writing to file TESTSUITE/test-mail/junk
considering: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}
-condition: def:return_path
- result: true
+ condition: def:return_path
+ result: true
considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox}
expanding: $return_path
diff --git a/test/stderr/0544 b/test/stderr/0544
index a95583ab7..f950e456c 100644
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -11,8 +11,8 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
-condition: def:sender_rcvhost
- result: false
+ condition: def:sender_rcvhost
+ 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}} ${if def:tls_cipher {($tls_cipher)
@@ -31,8 +31,8 @@ considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${i
${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
+ 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}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -49,8 +49,8 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name
result: CALLER
expanding: from ${quote_local_part:$sender_ident}
result: from CALLER
-condition: def:sender_helo_name
- result: false
+ condition: def:sender_helo_name
+ result: false
scanning: (helo=$sender_helo_name)
}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -65,8 +65,8 @@ condition: def:sender_helo_name
expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
}}
result: from CALLER
-condition: def:received_protocol
- result: true
+ condition: def:received_protocol
+ result: true
considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
@@ -74,8 +74,20 @@ considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
for $received_for}}
expanding: with $received_protocol
result: with local
-condition: def:sender_address
- result: true
+ condition: def:tls_cipher
+ result: false
+ scanning: ($tls_cipher)
+ }}(Exim $version_number)
+ ${if def:sender_address {(envelope-from <$sender_address>)
+ }}id $message_exim_id${if def:received_for {
+ for $received_for}}
+ expanding: ($tls_cipher)
+
+ result: ()
+
+ skipping: result is not used
+ condition: def:sender_address
+ result: true
considering: (envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@ -83,8 +95,8 @@ considering: (envelope-from <$sender_address>)
result: (envelope-from <CALLER@test.ex>)
-condition: def:received_for
- result: false
+ condition: def:received_for
+ result: false
scanning:
for $received_for}}
expanding:
@@ -138,8 +150,8 @@ considering: $h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
considering: (?i)auto-generated|auto-replied} }} {no}{yes}}
expanding: (?i)auto-generated|auto-replied
result: (?i)auto-generated|auto-replied
-condition: or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }}
- result: false
+ condition: or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }}
+ result: false
scanning: no}{yes}}
expanding: no
result: no
@@ -169,8 +181,8 @@ considering: +dlist}}
considering: $domain
expanding: $domain
result: ehlo.domain
-condition: match_domain {$sender_helo_name}{+dlist}
- result: true
+ condition: match_domain {$sender_helo_name}{+dlist}
+ result: true
expanding: ${if match_domain {$sender_helo_name}{+dlist}}
result: true
considering: domain=$domain/sender_domain=$sender_address_domain
diff --git a/test/stderr/4504 b/test/stderr/4504
new file mode 100644
index 000000000..045fadc9b
--- /dev/null
+++ b/test/stderr/4504
@@ -0,0 +1,2 @@
+
+******** SERVER ********
diff --git a/test/stderr/5410 b/test/stderr/5410
index f455075d1..fe3ed4429 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -18,8 +18,8 @@ considering: SERVER}{server}{queue}{cutthrough}}
considering: server}{queue}{cutthrough}}
expanding: server
result: server
-condition: eq {SERVER}{server}
- result: false
+ condition: eq {SERVER}{server}
+ result: false
scanning: queue}{cutthrough}}
expanding: queue
result: queue
@@ -69,8 +69,8 @@ considering: $address_data}{usery}{*}{:}}
considering: usery}{*}{:}}
expanding: usery
result: usery
-condition: eq {$address_data}{usery}
- result: false
+ condition: eq {$address_data}{usery}
+ result: false
scanning: *}{:}}
expanding: *
result: *
@@ -88,8 +88,8 @@ considering: $address_data}{userz}{*}{:}}
considering: userz}{*}{:}}
expanding: userz
result: userz
-condition: eq {$address_data}{userz}
- result: false
+ condition: eq {$address_data}{userz}
+ result: false
scanning: *}{:}}
expanding: *
result: *
@@ -134,8 +134,8 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
-condition: def:sender_rcvhost
- result: false
+ condition: def:sender_rcvhost
+ 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}} ${if def:tls_cipher {($tls_cipher)
@@ -154,8 +154,8 @@ considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${i
${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
+ 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}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -172,8 +172,8 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name
result: CALLER
expanding: from ${quote_local_part:$sender_ident}
result: from CALLER
-condition: def:sender_helo_name
- result: true
+ condition: def:sender_helo_name
+ result: true
considering: (helo=$sender_helo_name)
}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -188,8 +188,8 @@ considering: (helo=$sender_helo_name)
}}
result: from CALLER (helo=myhost.test.ex)
-condition: def:received_protocol
- result: true
+ condition: def:received_protocol
+ result: true
considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
@@ -197,8 +197,20 @@ considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
for $received_for}}
expanding: with $received_protocol
result: with local-esmtp
-condition: def:sender_address
- result: true
+ condition: def:tls_cipher
+ result: false
+ scanning: ($tls_cipher)
+ }}(Exim $version_number)
+ ${if def:sender_address {(envelope-from <$sender_address>)
+ }}id $message_exim_id${if def:received_for {
+ for $received_for}}
+ expanding: ($tls_cipher)
+
+ result: ()
+
+ skipping: result is not used
+ condition: def:sender_address
+ result: true
considering: (envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@ -206,8 +218,8 @@ considering: (envelope-from <$sender_address>)
result: (envelope-from <CALLER@myhost.test.ex>)
-condition: def:received_for
- result: true
+ condition: def:received_for
+ result: true
considering:
for $received_for}}
expanding:
@@ -264,8 +276,8 @@ considering: SERVER}{server}{queue}{cutthrough}}
considering: server}{queue}{cutthrough}}
expanding: server
result: server
-condition: eq {SERVER}{server}
- result: false
+ condition: eq {SERVER}{server}
+ result: false
scanning: queue}{cutthrough}}
expanding: queue
result: queue
@@ -315,8 +327,8 @@ considering: $address_data}{usery}{*}{:}}
considering: usery}{*}{:}}
expanding: usery
result: usery
-condition: eq {$address_data}{usery}
- result: true
+ condition: eq {$address_data}{usery}
+ result: true
considering: *}{:}}
expanding: *
result: *
@@ -349,8 +361,8 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
-condition: def:sender_rcvhost
- result: false
+ condition: def:sender_rcvhost
+ 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}} ${if def:tls_cipher {($tls_cipher)
@@ -369,8 +381,8 @@ considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${i
${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
+ 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}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -387,8 +399,8 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name
result: CALLER
expanding: from ${quote_local_part:$sender_ident}
result: from CALLER
-condition: def:sender_helo_name
- result: true
+ condition: def:sender_helo_name
+ result: true
considering: (helo=$sender_helo_name)
}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -403,8 +415,8 @@ considering: (helo=$sender_helo_name)
}}
result: from CALLER (helo=myhost.test.ex)
-condition: def:received_protocol
- result: true
+ condition: def:received_protocol
+ result: true
considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
@@ -412,8 +424,20 @@ considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
for $received_for}}
expanding: with $received_protocol
result: with local-esmtp
-condition: def:sender_address
- result: true
+ condition: def:tls_cipher
+ result: false
+ scanning: ($tls_cipher)
+ }}(Exim $version_number)
+ ${if def:sender_address {(envelope-from <$sender_address>)
+ }}id $message_exim_id${if def:received_for {
+ for $received_for}}
+ expanding: ($tls_cipher)
+
+ result: ()
+
+ skipping: result is not used
+ condition: def:sender_address
+ result: true
considering: (envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@ -421,8 +445,8 @@ considering: (envelope-from <$sender_address>)
result: (envelope-from <CALLER@myhost.test.ex>)
-condition: def:received_for
- result: true
+ condition: def:received_for
+ result: true
considering:
for $received_for}}
expanding:
@@ -479,8 +503,8 @@ considering: SERVER}{server}{queue}{cutthrough}}
considering: server}{queue}{cutthrough}}
expanding: server
result: server
-condition: eq {SERVER}{server}
- result: false
+ condition: eq {SERVER}{server}
+ result: false
scanning: queue}{cutthrough}}
expanding: queue
result: queue
@@ -530,8 +554,8 @@ considering: $address_data}{usery}{*}{:}}
considering: usery}{*}{:}}
expanding: usery
result: usery
-condition: eq {$address_data}{usery}
- result: true
+ condition: eq {$address_data}{usery}
+ result: true
considering: *}{:}}
expanding: *
result: *
@@ -564,8 +588,8 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
-condition: def:sender_rcvhost
- result: false
+ condition: def:sender_rcvhost
+ 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}} ${if def:tls_cipher {($tls_cipher)
@@ -584,8 +608,8 @@ considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${i
${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
+ 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}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -602,8 +626,8 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name
result: CALLER
expanding: from ${quote_local_part:$sender_ident}
result: from CALLER
-condition: def:sender_helo_name
- result: true
+ condition: def:sender_helo_name
+ result: true
considering: (helo=$sender_helo_name)
}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -618,8 +642,8 @@ considering: (helo=$sender_helo_name)
}}
result: from CALLER (helo=myhost.test.ex)
-condition: def:received_protocol
- result: true
+ condition: def:received_protocol
+ result: true
considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
@@ -627,8 +651,20 @@ considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
for $received_for}}
expanding: with $received_protocol
result: with local-esmtp
-condition: def:sender_address
- result: true
+ condition: def:tls_cipher
+ result: false
+ scanning: ($tls_cipher)
+ }}(Exim $version_number)
+ ${if def:sender_address {(envelope-from <$sender_address>)
+ }}id $message_exim_id${if def:received_for {
+ for $received_for}}
+ expanding: ($tls_cipher)
+
+ result: ()
+
+ skipping: result is not used
+ condition: def:sender_address
+ result: true
considering: (envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@ -636,8 +672,8 @@ considering: (envelope-from <$sender_address>)
result: (envelope-from <CALLER@myhost.test.ex>)
-condition: def:received_for
- result: true
+ condition: def:received_for
+ result: true
considering:
for $received_for}}
expanding:
diff --git a/test/stderr/5420 b/test/stderr/5420
index 9117875ef..623b99864 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -18,8 +18,8 @@ considering: SERVER}{server}{queue}{cutthrough}}
considering: server}{queue}{cutthrough}}
expanding: server
result: server
-condition: eq {SERVER}{server}
- result: false
+ condition: eq {SERVER}{server}
+ result: false
scanning: queue}{cutthrough}}
expanding: queue
result: queue
@@ -69,8 +69,8 @@ considering: $address_data}{usery}{*}{:}}
considering: usery}{*}{:}}
expanding: usery
result: usery
-condition: eq {$address_data}{usery}
- result: false
+ condition: eq {$address_data}{usery}
+ result: false
scanning: *}{:}}
expanding: *
result: *
@@ -88,8 +88,8 @@ considering: $address_data}{userz}{*}{:}}
considering: userz}{*}{:}}
expanding: userz
result: userz
-condition: eq {$address_data}{userz}
- result: false
+ condition: eq {$address_data}{userz}
+ result: false
scanning: *}{:}}
expanding: *
result: *
@@ -133,8 +133,8 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
-condition: def:sender_rcvhost
- result: false
+ condition: def:sender_rcvhost
+ 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}} ${if def:tls_cipher {($tls_cipher)
@@ -153,8 +153,8 @@ considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${i
${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
+ 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}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -171,8 +171,8 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name
result: CALLER
expanding: from ${quote_local_part:$sender_ident}
result: from CALLER
-condition: def:sender_helo_name
- result: true
+ condition: def:sender_helo_name
+ result: true
considering: (helo=$sender_helo_name)
}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -187,8 +187,8 @@ considering: (helo=$sender_helo_name)
}}
result: from CALLER (helo=myhost.test.ex)
-condition: def:received_protocol
- result: true
+ condition: def:received_protocol
+ result: true
considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
@@ -196,8 +196,20 @@ considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
for $received_for}}
expanding: with $received_protocol
result: with local-esmtp
-condition: def:sender_address
- result: true
+ condition: def:tls_cipher
+ result: false
+ scanning: ($tls_cipher)
+ }}(Exim $version_number)
+ ${if def:sender_address {(envelope-from <$sender_address>)
+ }}id $message_exim_id${if def:received_for {
+ for $received_for}}
+ expanding: ($tls_cipher)
+
+ result: ()
+
+ skipping: result is not used
+ condition: def:sender_address
+ result: true
considering: (envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@ -205,8 +217,8 @@ considering: (envelope-from <$sender_address>)
result: (envelope-from <CALLER@myhost.test.ex>)
-condition: def:received_for
- result: true
+ condition: def:received_for
+ result: true
considering:
for $received_for}}
expanding:
@@ -263,8 +275,8 @@ considering: SERVER}{server}{queue}{cutthrough}}
considering: server}{queue}{cutthrough}}
expanding: server
result: server
-condition: eq {SERVER}{server}
- result: false
+ condition: eq {SERVER}{server}
+ result: false
scanning: queue}{cutthrough}}
expanding: queue
result: queue
@@ -314,8 +326,8 @@ considering: $address_data}{usery}{*}{:}}
considering: usery}{*}{:}}
expanding: usery
result: usery
-condition: eq {$address_data}{usery}
- result: true
+ condition: eq {$address_data}{usery}
+ result: true
considering: *}{:}}
expanding: *
result: *
@@ -348,8 +360,8 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
-condition: def:sender_rcvhost
- result: false
+ condition: def:sender_rcvhost
+ 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}} ${if def:tls_cipher {($tls_cipher)
@@ -368,8 +380,8 @@ considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${i
${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
+ 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}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -386,8 +398,8 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name
result: CALLER
expanding: from ${quote_local_part:$sender_ident}
result: from CALLER
-condition: def:sender_helo_name
- result: true
+ condition: def:sender_helo_name
+ result: true
considering: (helo=$sender_helo_name)
}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -402,8 +414,8 @@ considering: (helo=$sender_helo_name)
}}
result: from CALLER (helo=myhost.test.ex)
-condition: def:received_protocol
- result: true
+ condition: def:received_protocol
+ result: true
considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
@@ -411,8 +423,20 @@ considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
for $received_for}}
expanding: with $received_protocol
result: with local-esmtp
-condition: def:sender_address
- result: true
+ condition: def:tls_cipher
+ result: false
+ scanning: ($tls_cipher)
+ }}(Exim $version_number)
+ ${if def:sender_address {(envelope-from <$sender_address>)
+ }}id $message_exim_id${if def:received_for {
+ for $received_for}}
+ expanding: ($tls_cipher)
+
+ result: ()
+
+ skipping: result is not used
+ condition: def:sender_address
+ result: true
considering: (envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@ -420,8 +444,8 @@ considering: (envelope-from <$sender_address>)
result: (envelope-from <CALLER@myhost.test.ex>)
-condition: def:received_for
- result: true
+ condition: def:received_for
+ result: true
considering:
for $received_for}}
expanding:
@@ -478,8 +502,8 @@ considering: SERVER}{server}{queue}{cutthrough}}
considering: server}{queue}{cutthrough}}
expanding: server
result: server
-condition: eq {SERVER}{server}
- result: false
+ condition: eq {SERVER}{server}
+ result: false
scanning: queue}{cutthrough}}
expanding: queue
result: queue
@@ -529,8 +553,8 @@ considering: $address_data}{usery}{*}{:}}
considering: usery}{*}{:}}
expanding: usery
result: usery
-condition: eq {$address_data}{usery}
- result: true
+ condition: eq {$address_data}{usery}
+ result: true
considering: *}{:}}
expanding: *
result: *
@@ -563,8 +587,8 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
${if def:sender_address {(envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
-condition: def:sender_rcvhost
- result: false
+ condition: def:sender_rcvhost
+ 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}} ${if def:tls_cipher {($tls_cipher)
@@ -583,8 +607,8 @@ considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${i
${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
+ 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}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -601,8 +625,8 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name
result: CALLER
expanding: from ${quote_local_part:$sender_ident}
result: from CALLER
-condition: def:sender_helo_name
- result: true
+ condition: def:sender_helo_name
+ result: true
considering: (helo=$sender_helo_name)
}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
@@ -617,8 +641,8 @@ considering: (helo=$sender_helo_name)
}}
result: from CALLER (helo=myhost.test.ex)
-condition: def:received_protocol
- result: true
+ condition: def:received_protocol
+ result: true
considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
}}(Exim $version_number)
${if def:sender_address {(envelope-from <$sender_address>)
@@ -626,8 +650,20 @@ considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
for $received_for}}
expanding: with $received_protocol
result: with local-esmtp
-condition: def:sender_address
- result: true
+ condition: def:tls_cipher
+ result: false
+ scanning: ($tls_cipher)
+ }}(Exim $version_number)
+ ${if def:sender_address {(envelope-from <$sender_address>)
+ }}id $message_exim_id${if def:received_for {
+ for $received_for}}
+ expanding: ($tls_cipher)
+
+ result: ()
+
+ skipping: result is not used
+ condition: def:sender_address
+ result: true
considering: (envelope-from <$sender_address>)
}}id $message_exim_id${if def:received_for {
for $received_for}}
@@ -635,8 +671,8 @@ considering: (envelope-from <$sender_address>)
result: (envelope-from <CALLER@myhost.test.ex>)
-condition: def:received_for
- result: true
+ condition: def:received_for
+ result: true
considering:
for $received_for}}
expanding:
diff --git a/test/stdout/0002 b/test/stdout/0002
index 0bbd4c754..a19cc526c 100644
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -169,6 +169,20 @@
> hex2b64:MPPJPkZDbetYunCBao7BJA==
> hex2b64:ztcfpyNSMb7Tg/rP3EHE3cwi7PE=
>
+> base32: 0 <>
+> base32: 1 <b>
+> base32: 31 <7>
+> base32: 32 <ba>
+> base32: 42 <bk>
+> Failed: argument for base32 operator is "0x1", which is not a decimal number
+>
+> base32d: 0 0
+> base32d: 1 1
+> base32d: 31 31
+> base32d: 32 32
+> base32d: 42 42
+> Failed: argument for base32d operator is "ABC", which is not a base 32 number
+>
> The base62 operator is actually a base36 operator in the Darwin and Cygwin
> environments. Write cunning tests that produce the same output in both cases,
> while doing a reasonable check.
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-22 01:50:32 +0000