From c2decce2cb31c21601da988ef6ef02bec9073bdd Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 20 Jan 2021 20:44:21 +0000 Subject: Testsuite: TLS client testcase consolidation --- test/confs/0900 | 7 +- test/confs/1103 | 44 ------ test/confs/1150 | 86 +++++++++++ test/confs/1151 | 44 ++++++ test/confs/1152 | 70 +++++++++ test/confs/1153 | 61 ++++++++ test/confs/1157 | 72 ++++++++++ test/confs/1158 | 43 ++++++ test/confs/1159 | 65 +++++++++ test/confs/1161 | 44 ++++++ test/confs/1163 | 63 ++++++++ test/confs/1164 | 44 ++++++ test/confs/1165 | 1 + test/confs/2007 | 67 --------- test/confs/2008 | 86 ----------- test/confs/2009 | 61 -------- test/confs/2013 | 74 ---------- test/confs/2016 | 43 ------ test/confs/2017 | 69 --------- test/confs/2021 | 44 ------ test/confs/2033 | 4 +- test/confs/2038 | 64 --------- test/confs/2051 | 1 - test/confs/2091 | 1 - test/confs/2107 | 66 --------- test/confs/2108 | 84 ----------- test/confs/2109 | 61 -------- test/confs/2113 | 72 ---------- test/confs/2116 | 43 ------ test/confs/2117 | 67 --------- test/confs/2121 | 44 ------ test/confs/2133 | 5 +- test/confs/2138 | 63 -------- test/confs/2151 | 44 ------ test/confs/2191 | 1 - test/log/1103 | 9 -- test/log/1150 | 25 ++++ test/log/1151 | 9 ++ test/log/1152 | 9 ++ test/log/1153 | 10 ++ test/log/1157 | 69 +++++++++ test/log/1158 | 2 + test/log/1159 | 19 +++ test/log/1161 | 10 ++ test/log/1163 | 41 ++++++ test/log/1164 | 2 + test/log/1165 | 7 + test/log/2007 | 9 -- test/log/2008 | 25 ---- test/log/2009 | 10 -- test/log/2013 | 69 --------- test/log/2016 | 2 - test/log/2017 | 19 --- test/log/2021 | 10 -- test/log/2033 | 20 ++- test/log/2038 | 41 ------ test/log/2051 | 2 - test/log/2091 | 7 - test/log/2107 | 11 -- test/log/2108 | 31 ---- test/log/2109 | 10 -- test/log/2113 | 69 --------- test/log/2116 | 2 - test/log/2117 | 19 --- test/log/2121 | 10 -- test/log/2138 | 41 ------ test/log/2151 | 2 - test/log/2191 | 9 -- test/mail/1150.CALLER | 34 +++++ test/mail/1150.abcd | 17 +++ test/mail/1150.xyz | 16 +++ test/mail/1157.usera | 18 +++ test/mail/1157.userb | 18 +++ test/mail/1157.userc | 18 +++ test/mail/1157.userx | 18 +++ test/mail/1157.usery | 18 +++ test/mail/1157.userz | 18 +++ test/mail/1159.userx | 36 +++++ test/mail/1163.userx0 | 17 +++ test/mail/1163.userx1 | 17 +++ test/mail/1163.usery0 | 17 +++ test/mail/1163.usery1 | 17 +++ test/mail/1163.userz0 | 17 +++ test/mail/1163.userz1 | 17 +++ test/mail/2008.CALLER | 34 ----- test/mail/2008.abcd | 17 --- test/mail/2008.xyz | 16 --- test/mail/2013.usera | 18 --- test/mail/2013.userb | 18 --- test/mail/2013.userc | 18 --- test/mail/2013.userx | 18 --- test/mail/2013.usery | 18 --- test/mail/2013.userz | 18 --- test/mail/2017.userx | 36 ----- test/mail/2038.userx0 | 17 --- test/mail/2038.userx1 | 17 --- test/mail/2038.usery0 | 17 --- test/mail/2038.usery1 | 17 --- test/mail/2038.userz0 | 17 --- test/mail/2038.userz1 | 17 --- test/mail/2108.CALLER | 34 ----- test/mail/2108.abcd | 17 --- test/mail/2108.xyz | 16 --- test/mail/2113.usera | 18 --- test/mail/2113.userb | 18 --- test/mail/2113.userc | 18 --- test/mail/2113.userx | 18 --- test/mail/2113.usery | 18 --- test/mail/2113.userz | 18 --- test/mail/2117.userx | 36 ----- test/mail/2138.userx0 | 17 --- test/mail/2138.userx1 | 17 --- test/mail/2138.usery0 | 17 --- test/mail/2138.usery1 | 17 --- test/mail/2138.userz0 | 17 --- test/mail/2138.userz1 | 17 --- test/msglog/1157.10HmbM-0005vi-00 | 1 + test/msglog/1157.10HmbN-0005vi-00 | 1 + test/msglog/1157.10HmbO-0005vi-00 | 1 + test/msglog/2013.10HmbM-0005vi-00 | 1 - test/msglog/2013.10HmbN-0005vi-00 | 1 - test/msglog/2013.10HmbO-0005vi-00 | 1 - test/msglog/2113.10HmbM-0005vi-00 | 1 - test/msglog/2113.10HmbN-0005vi-00 | 1 - test/msglog/2113.10HmbO-0005vi-00 | 1 - test/rejectlog/1153 | 3 + test/rejectlog/2009 | 3 - test/rejectlog/2109 | 3 - test/runtest | 2 + test/scripts/1100-Basic-TLS/1103 | 21 --- test/scripts/1100-Basic-TLS/1150 | 15 ++ test/scripts/1100-Basic-TLS/1151 | 21 +++ test/scripts/1100-Basic-TLS/1152 | 11 ++ test/scripts/1100-Basic-TLS/1153 | 11 ++ test/scripts/1100-Basic-TLS/1157 | 52 +++++++ test/scripts/1100-Basic-TLS/1158 | 16 +++ test/scripts/1100-Basic-TLS/1159 | 15 ++ test/scripts/1100-Basic-TLS/1161 | 53 +++++++ test/scripts/1100-Basic-TLS/1163 | 18 +++ test/scripts/1100-Basic-TLS/1164 | 34 +++++ test/scripts/1100-Basic-TLS/1165 | 9 ++ test/scripts/2000-GnuTLS/2007 | 11 -- test/scripts/2000-GnuTLS/2008 | 15 -- test/scripts/2000-GnuTLS/2009 | 11 -- test/scripts/2000-GnuTLS/2013 | 52 ------- test/scripts/2000-GnuTLS/2016 | 16 --- test/scripts/2000-GnuTLS/2017 | 15 -- test/scripts/2000-GnuTLS/2021 | 53 ------- test/scripts/2000-GnuTLS/2033 | 6 +- test/scripts/2000-GnuTLS/2038 | 18 --- test/scripts/2000-GnuTLS/2051 | 1 - test/scripts/2000-GnuTLS/2091 | 9 -- test/scripts/2100-OpenSSL/2107 | 10 -- test/scripts/2100-OpenSSL/2108 | 14 -- test/scripts/2100-OpenSSL/2109 | 10 -- test/scripts/2100-OpenSSL/2113 | 51 ------- test/scripts/2100-OpenSSL/2116 | 15 -- test/scripts/2100-OpenSSL/2117 | 14 -- test/scripts/2100-OpenSSL/2121 | 52 ------- test/scripts/2100-OpenSSL/2138 | 17 --- test/scripts/2100-OpenSSL/2151 | 34 ----- test/scripts/2100-OpenSSL/2191 | 8 -- test/stderr/1150 | 103 +++++++++++++ test/stderr/1157 | 296 ++++++++++++++++++++++++++++++++++++++ test/stderr/2008 | 103 ------------- test/stderr/2013 | 296 -------------------------------------- test/stderr/2108 | 115 --------------- test/stderr/2113 | 296 -------------------------------------- test/stdout/1158 | 13 ++ test/stdout/1161 | 57 ++++++++ test/stdout/2016 | 13 -- test/stdout/2021 | 57 -------- test/stdout/2116 | 13 -- test/stdout/2121 | 57 -------- 174 files changed, 1869 insertions(+), 3555 deletions(-) delete mode 100644 test/confs/1103 create mode 100644 test/confs/1150 create mode 100644 test/confs/1151 create mode 100644 test/confs/1152 create mode 100644 test/confs/1153 create mode 100644 test/confs/1157 create mode 100644 test/confs/1158 create mode 100644 test/confs/1159 create mode 100644 test/confs/1161 create mode 100644 test/confs/1163 create mode 100644 test/confs/1164 create mode 120000 test/confs/1165 delete mode 100644 test/confs/2007 delete mode 100644 test/confs/2008 delete mode 100644 test/confs/2009 delete mode 100644 test/confs/2013 delete mode 100644 test/confs/2016 delete mode 100644 test/confs/2017 delete mode 100644 test/confs/2021 delete mode 100644 test/confs/2038 delete mode 120000 test/confs/2051 delete mode 120000 test/confs/2091 delete mode 100644 test/confs/2107 delete mode 100644 test/confs/2108 delete mode 100644 test/confs/2109 delete mode 100644 test/confs/2113 delete mode 100644 test/confs/2116 delete mode 100644 test/confs/2117 delete mode 100644 test/confs/2121 delete mode 100644 test/confs/2138 delete mode 100644 test/confs/2151 delete mode 120000 test/confs/2191 delete mode 100644 test/log/1103 create mode 100644 test/log/1150 create mode 100644 test/log/1151 create mode 100644 test/log/1152 create mode 100644 test/log/1153 create mode 100644 test/log/1157 create mode 100644 test/log/1158 create mode 100644 test/log/1159 create mode 100644 test/log/1161 create mode 100644 test/log/1163 create mode 100644 test/log/1164 create mode 100644 test/log/1165 delete mode 100644 test/log/2007 delete mode 100644 test/log/2008 delete mode 100644 test/log/2009 delete mode 100644 test/log/2013 delete mode 100644 test/log/2016 delete mode 100644 test/log/2017 delete mode 100644 test/log/2021 delete mode 100644 test/log/2038 delete mode 100644 test/log/2051 delete mode 100644 test/log/2091 delete mode 100644 test/log/2107 delete mode 100644 test/log/2108 delete mode 100644 test/log/2109 delete mode 100644 test/log/2113 delete mode 100644 test/log/2116 delete mode 100644 test/log/2117 delete mode 100644 test/log/2121 delete mode 100644 test/log/2138 delete mode 100644 test/log/2151 delete mode 100644 test/log/2191 create mode 100644 test/mail/1150.CALLER create mode 100644 test/mail/1150.abcd create mode 100644 test/mail/1150.xyz create mode 100644 test/mail/1157.usera create mode 100644 test/mail/1157.userb create mode 100644 test/mail/1157.userc create mode 100644 test/mail/1157.userx create mode 100644 test/mail/1157.usery create mode 100644 test/mail/1157.userz create mode 100644 test/mail/1159.userx create mode 100644 test/mail/1163.userx0 create mode 100644 test/mail/1163.userx1 create mode 100644 test/mail/1163.usery0 create mode 100644 test/mail/1163.usery1 create mode 100644 test/mail/1163.userz0 create mode 100644 test/mail/1163.userz1 delete mode 100644 test/mail/2008.CALLER delete mode 100644 test/mail/2008.abcd delete mode 100644 test/mail/2008.xyz delete mode 100644 test/mail/2013.usera delete mode 100644 test/mail/2013.userb delete mode 100644 test/mail/2013.userc delete mode 100644 test/mail/2013.userx delete mode 100644 test/mail/2013.usery delete mode 100644 test/mail/2013.userz delete mode 100644 test/mail/2017.userx delete mode 100644 test/mail/2038.userx0 delete mode 100644 test/mail/2038.userx1 delete mode 100644 test/mail/2038.usery0 delete mode 100644 test/mail/2038.usery1 delete mode 100644 test/mail/2038.userz0 delete mode 100644 test/mail/2038.userz1 delete mode 100644 test/mail/2108.CALLER delete mode 100644 test/mail/2108.abcd delete mode 100644 test/mail/2108.xyz delete mode 100644 test/mail/2113.usera delete mode 100644 test/mail/2113.userb delete mode 100644 test/mail/2113.userc delete mode 100644 test/mail/2113.userx delete mode 100644 test/mail/2113.usery delete mode 100644 test/mail/2113.userz delete mode 100644 test/mail/2117.userx delete mode 100644 test/mail/2138.userx0 delete mode 100644 test/mail/2138.userx1 delete mode 100644 test/mail/2138.usery0 delete mode 100644 test/mail/2138.usery1 delete mode 100644 test/mail/2138.userz0 delete mode 100644 test/mail/2138.userz1 create mode 100644 test/msglog/1157.10HmbM-0005vi-00 create mode 100644 test/msglog/1157.10HmbN-0005vi-00 create mode 100644 test/msglog/1157.10HmbO-0005vi-00 delete mode 100644 test/msglog/2013.10HmbM-0005vi-00 delete mode 100644 test/msglog/2013.10HmbN-0005vi-00 delete mode 100644 test/msglog/2013.10HmbO-0005vi-00 delete mode 100644 test/msglog/2113.10HmbM-0005vi-00 delete mode 100644 test/msglog/2113.10HmbN-0005vi-00 delete mode 100644 test/msglog/2113.10HmbO-0005vi-00 create mode 100644 test/rejectlog/1153 delete mode 100644 test/rejectlog/2009 delete mode 100644 test/rejectlog/2109 delete mode 100644 test/scripts/1100-Basic-TLS/1103 create mode 100644 test/scripts/1100-Basic-TLS/1150 create mode 100644 test/scripts/1100-Basic-TLS/1151 create mode 100644 test/scripts/1100-Basic-TLS/1152 create mode 100644 test/scripts/1100-Basic-TLS/1153 create mode 100644 test/scripts/1100-Basic-TLS/1157 create mode 100644 test/scripts/1100-Basic-TLS/1158 create mode 100644 test/scripts/1100-Basic-TLS/1159 create mode 100644 test/scripts/1100-Basic-TLS/1161 create mode 100644 test/scripts/1100-Basic-TLS/1163 create mode 100644 test/scripts/1100-Basic-TLS/1164 create mode 100644 test/scripts/1100-Basic-TLS/1165 delete mode 100644 test/scripts/2000-GnuTLS/2007 delete mode 100644 test/scripts/2000-GnuTLS/2008 delete mode 100644 test/scripts/2000-GnuTLS/2009 delete mode 100644 test/scripts/2000-GnuTLS/2013 delete mode 100644 test/scripts/2000-GnuTLS/2016 delete mode 100644 test/scripts/2000-GnuTLS/2017 delete mode 100644 test/scripts/2000-GnuTLS/2021 delete mode 100644 test/scripts/2000-GnuTLS/2038 delete mode 120000 test/scripts/2000-GnuTLS/2051 delete mode 100644 test/scripts/2000-GnuTLS/2091 delete mode 100644 test/scripts/2100-OpenSSL/2107 delete mode 100644 test/scripts/2100-OpenSSL/2108 delete mode 100644 test/scripts/2100-OpenSSL/2109 delete mode 100644 test/scripts/2100-OpenSSL/2113 delete mode 100644 test/scripts/2100-OpenSSL/2116 delete mode 100644 test/scripts/2100-OpenSSL/2117 delete mode 100644 test/scripts/2100-OpenSSL/2121 delete mode 100644 test/scripts/2100-OpenSSL/2138 delete mode 100644 test/scripts/2100-OpenSSL/2151 delete mode 100644 test/scripts/2100-OpenSSL/2191 create mode 100644 test/stderr/1150 create mode 100644 test/stderr/1157 delete mode 100644 test/stderr/2008 delete mode 100644 test/stderr/2013 delete mode 100644 test/stderr/2108 delete mode 100644 test/stderr/2113 create mode 100644 test/stdout/1158 create mode 100644 test/stdout/1161 delete mode 100644 test/stdout/2016 delete mode 100644 test/stdout/2021 delete mode 100644 test/stdout/2116 delete mode 100644 test/stdout/2121 (limited to 'test') diff --git a/test/confs/0900 b/test/confs/0900 index df1540cfb..ffce9e886 100644 --- a/test/confs/0900 +++ b/test/confs/0900 @@ -43,8 +43,7 @@ log_selector = +received_recipients .endif .ifdef _OPT_MAIN_TLS_CERTIFICATE -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} -tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} +tls_certificate = DIR/aux-fixed/cert1 .endif ALLOW @@ -107,6 +106,8 @@ remote_smtp: hosts = 127.0.0.1 port = PORT_S hosts_try_fastopen = : + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = allow_localhost command_timeout = 2s final_timeout = 2s @@ -116,6 +117,8 @@ remote_smtp_dkim: hosts = 127.0.0.1 port = PORT_S hosts_try_fastopen = : + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = allow_localhost command_timeout = 2s final_timeout = 2s diff --git a/test/confs/1103 b/test/confs/1103 deleted file mode 100644 index 52f471b79..000000000 --- a/test/confs/1103 +++ /dev/null @@ -1,44 +0,0 @@ -# Exim test configuration 1103 - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -tls_advertise_hosts = * - -tls_certificate = DIR/tmp/certs/servercert -tls_privatekey = DIR/tmp/certs/serverkey -tls_try_verify_hosts = * -tls_verify_certificates = DIR/aux-fixed/cert2 -#tls_verify_certificates = system,cache - -queue_only -log_selector = +millisec - -# --- ACL --- - -acl_smtp_rcpt = accept - -# ---- - -begin routers - -all: - driver = accept - transport = smtp - -begin transports - -smtp: - driver = smtp - hosts = 127.0.0.1 - allow_localhost - port = PORT_D - hosts_try_fastopen = : - tls_certificate = DIR/aux-fixed/cert2 - tls_verify_certificates = DIR/aux-fixed/cert1 - tls_verify_cert_hostnames = : - -# End diff --git a/test/confs/1150 b/test/confs/1150 new file mode 100644 index 000000000..b98c8dc45 --- /dev/null +++ b/test/confs/1150 @@ -0,0 +1,86 @@ +# Exim test configuration 1150 + +SERVER = + +.include DIR/aux-var/tls_conf_prefix + +primary_hostname = myhost.test.ex + + +# ----- Main settings ----- + +domainlist local_domains = test.ex : *.test.ex + +acl_smtp_rcpt = check_recipient +queue_only +queue_run_in_order +remote_max_parallel = 1 + +tls_advertise_hosts = * +tls_certificate = DIR/aux-fixed/cert1 + + +# ------ ACL ------ + +begin acl + +check_recipient: + accept domains = +local_domains + deny message = relay not permitted + + +# ----- Routers ----- + +begin routers + +client: + driver = accept + condition = ${if eq {SERVER}{server}{no}{yes}} + retry_use_local_part + transport = send_to_server${if eq{$local_part}{abcd}{2}{1}} + +server: + driver = accept + retry_use_local_part + transport = local_delivery + + +# ----- Transports ----- + +begin transports + +local_delivery: + driver = appendfile + file = DIR/test-mail/${bless:$local_part} + headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn + user = CALLER + +send_to_server1: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_D + hosts_try_fastopen = : + helo_data = helo.data.changed + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = + +send_to_server2: + driver = smtp + allow_localhost + hosts = HOSTIPV4 + port = PORT_D + hosts_try_fastopen = : + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = + + +# ----- Retry ----- + + +begin retry + +* * F,5d,10s + + +# End diff --git a/test/confs/1151 b/test/confs/1151 new file mode 100644 index 000000000..4729c9222 --- /dev/null +++ b/test/confs/1151 @@ -0,0 +1,44 @@ +# Exim test configuration 1151 + +.include DIR/aux-var/tls_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +tls_advertise_hosts = * + +tls_certificate = DIR/tmp/certs/servercert +tls_privatekey = DIR/tmp/certs/serverkey +tls_try_verify_hosts = * +tls_verify_certificates = DIR/aux-fixed/cert2 +#tls_verify_certificates = system,cache + +queue_only +log_selector = +millisec + +# --- ACL --- + +acl_smtp_rcpt = accept + +# ---- + +begin routers + +all: + driver = accept + transport = smtp + +begin transports + +smtp: + driver = smtp + hosts = 127.0.0.1 + allow_localhost + port = PORT_D + hosts_try_fastopen = : + tls_certificate = DIR/aux-fixed/cert2 + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = : + +# End diff --git a/test/confs/1152 b/test/confs/1152 new file mode 100644 index 000000000..eadea0a8a --- /dev/null +++ b/test/confs/1152 @@ -0,0 +1,70 @@ +# Exim test configuration 1152 + +SERVER = + +.include DIR/aux-var/tls_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +acl_smtp_rcpt = accept + +log_selector = +smtp_confirmation + +queue_only +queue_run_in_order + +tls_advertise_hosts = * +.ifdef _HAVE_GNUTLS +tls_require_ciphers = NORMAL:!DHE-RSA:!DHE-DSS:!ECDHE-RSA:!ECDHE-ECDSA:!ECDHE-PSK +.endif + +tls_certificate = DIR/aux-fixed/cert1 + + +# ----- Routers ----- + +begin routers + +client: + driver = accept + condition = ${if eq {SERVER}{server}{no}{yes}} + retry_use_local_part + transport = send_to_server${if eq{$local_part}{abcd}{2}{1}} + +server: + driver = accept + retry_use_local_part + transport = local_delivery + + +# ----- Transports ----- + +begin transports + +local_delivery: + driver = appendfile + file = DIR/test-mail/${bless:$local_part} + headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn + user = CALLER + +send_to_server1: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_D + hosts_try_fastopen = : + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = + +send_to_server2: + driver = smtp + allow_localhost + hosts = HOSTIPV4 + port = PORT_D + hosts_try_fastopen = : + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = + +# End diff --git a/test/confs/1153 b/test/confs/1153 new file mode 100644 index 000000000..13e2c4097 --- /dev/null +++ b/test/confs/1153 @@ -0,0 +1,61 @@ +# Exim test configuration 1153 + +SERVER = + +.include DIR/aux-var/tls_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +acl_smtp_rcpt = check_recipient +hostlist tls_hosts = 127.0.0.1 + +queue_only +queue_run_in_order + +tls_advertise_hosts = * + +# Set certificate only if server + +tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} +tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} + + + +# ----- ACL ----- + +begin acl + +check_recipient: + deny hosts = +tls_hosts + message = encryption required + !encrypted = * + accept domains = +local_domains + deny message = relay not permitted + + +# ----- Routers ----- + +begin routers + +client: + driver = accept + condition = ${if eq {SERVER}{server}{no}{yes}} + retry_use_local_part + transport = send_to_server + + +# ----- Transports ----- + +begin transports + +send_to_server: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_D + hosts_try_fastopen = : + hosts_avoid_tls = 127.0.0.1 + +# End diff --git a/test/confs/1157 b/test/confs/1157 new file mode 100644 index 000000000..1b12a5ff5 --- /dev/null +++ b/test/confs/1157 @@ -0,0 +1,72 @@ +# Exim test configuration 1157 + +SERVER = +PEX = : + +.include DIR/aux-var/tls_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +acl_smtp_rcpt = accept + +log_selector = +smtp_connection+incoming_port+received_recipients + +queue_only +queue_run_in_order + +smtp_accept_max_nonmail = 0 + +tls_advertise_hosts = * + +tls_certificate = DIR/aux-fixed/cert1 + + +# ----- Routers ----- + +begin routers + +.ifdef REQUIRE +cl_override: + driver = manualroute + route_data = HOSTIPV4 + retry_use_local_part + transport = send_to_server + self = send +.endif + +client: + driver = accept + condition = ${if eq {SERVER}{server}{no}{yes}} + retry_use_local_part + transport = send_to_server + +server: + driver = accept + retry_use_local_part + transport = local_delivery + + +# ----- Transports ----- + +begin transports + +local_delivery: + driver = appendfile + file = DIR/test-mail/${bless:$local_part} + headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn + user = CALLER + +send_to_server: + driver = smtp + allow_localhost + hosts_override + hosts = 127.0.0.1 + port = PORT_D + hosts_try_fastopen = : + hosts_noproxy_tls = PEX + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = : + +# End diff --git a/test/confs/1158 b/test/confs/1158 new file mode 100644 index 000000000..b4a5f9703 --- /dev/null +++ b/test/confs/1158 @@ -0,0 +1,43 @@ +# Exim test configuration 1158 + +.include DIR/aux-var/std_conf_prefix + + +# ----- Main settings ----- + +qualify_domain = test.ex + + +# ----- Routers ----- + +begin routers + +others: + driver = manualroute + route_list = * 127.0.0.1 byname + self = send + transport = smtp + no_more + + +# ----- Transports ----- + +begin transports + +smtp: + driver = smtp + command_timeout = 1s + hosts_require_tls = 127.0.0.1 + port = PORT_S + hosts_try_fastopen = : + + +# ----- Retry ----- + + +begin retry + +* * F,5d,1d + + +# End diff --git a/test/confs/1159 b/test/confs/1159 new file mode 100644 index 000000000..a549a9f77 --- /dev/null +++ b/test/confs/1159 @@ -0,0 +1,65 @@ +# Exim test configuration 1159 + +SERVER = + +.include DIR/aux-var/tls_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +acl_smtp_rcpt = accept + +queue_only +queue_run_in_order + +tls_advertise_hosts = * +tls_certificate = DIR/aux-fixed/cert1 + + +# ----- Routers ----- + +begin routers + +client: + driver = accept + condition = ${if eq {SERVER}{server}{no}{yes}} + retry_use_local_part + transport = send_to_server + +server: + driver = accept + retry_use_local_part + transport = local_delivery + + +# ----- Transports ----- + +begin transports + +local_delivery: + driver = appendfile + file = DIR/test-mail/${bless:$local_part} + headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn + user = CALLER + +send_to_server: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_D + hosts_try_fastopen = : + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = : + hosts_nopass_tls = * + + +# ----- Retry ----- + + +begin retry + +* * F,5d,10s + + +# End diff --git a/test/confs/1161 b/test/confs/1161 new file mode 100644 index 000000000..ae7c16181 --- /dev/null +++ b/test/confs/1161 @@ -0,0 +1,44 @@ +# Exim test configuration 1161 + +REQUIRE=# +TRYCLEAR=# + +.include DIR/aux-var/std_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + + +# ----- Routers ----- + +begin routers + +client: + driver = accept + transport = send_to_server + + +# ----- Transports ----- + +begin transports + +send_to_server: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_S + hosts_try_fastopen = : + REQUIRE + TRYCLEAR + + +# ----- Retry ----- + + +begin retry + +* * F,5d,10s + + +# End diff --git a/test/confs/1163 b/test/confs/1163 new file mode 100644 index 000000000..f9d1ab1bf --- /dev/null +++ b/test/confs/1163 @@ -0,0 +1,63 @@ +# Exim test configuration 1163 + +SERVER = + +.include DIR/aux-var/tls_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +acl_smtp_rcpt = accept + +log_selector = +smtp_connection+incoming_port+received_recipients + +queue_only +queue_run_in_order +remote_max_parallel = 1 + +smtp_accept_max_nonmail = 0 + +tls_advertise_hosts = * +tls_certificate = DIR/aux-fixed/cert1 + + +# ----- Routers ----- + +begin routers + +client: + driver = manualroute + condition = ${if eq {SERVER}{server}{no}{yes}} + route_data = 127.0.0.1 + self = send + retry_use_local_part + transport = send_to_server + +server: + driver = accept + retry_use_local_part + transport = local_delivery + + +# ----- Transports ----- + +begin transports + +local_delivery: + driver = appendfile + file = DIR/test-mail/${bless:$local_part} + headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn + user = CALLER + +send_to_server: + driver = smtp + allow_localhost + port = PORT_D + hosts_try_fastopen = : + hosts_noproxy_tls = : + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = : + max_rcpt = 1 + +# End diff --git a/test/confs/1164 b/test/confs/1164 new file mode 100644 index 000000000..9c13ad58c --- /dev/null +++ b/test/confs/1164 @@ -0,0 +1,44 @@ +# Exim test configuration 1164 + +.include DIR/aux-var/tls_conf_prefix + + +# ----- Main settings ----- + +acl_smtp_rcpt = acl_rcpt +callout_random_local_part = $primary_hostname--testing +trusted_users = CALLER + +tls_advertise_hosts = 127.0.0.1 : HOSTIPV4 + +tls_certificate = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem +tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key + +# ----- ACL ----- + +begin acl + +acl_rcpt: + accept verify = recipient/callout=1s,use_sender + +# ----- Routers ----- + +begin routers + +callout: + driver = manualroute + transport = smtp + route_data = 127.0.0.1 + self = send + + +# ----- Transports ----- + +begin transports + +smtp: + driver = smtp + port = PORT_S + hosts_try_fastopen = : + +# End diff --git a/test/confs/1165 b/test/confs/1165 new file mode 120000 index 000000000..1bb987150 --- /dev/null +++ b/test/confs/1165 @@ -0,0 +1 @@ +0900 \ No newline at end of file diff --git a/test/confs/2007 b/test/confs/2007 deleted file mode 100644 index db46a6c6f..000000000 --- a/test/confs/2007 +++ /dev/null @@ -1,67 +0,0 @@ -# Exim test configuration 2007 - -SERVER = - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = accept - -log_selector = +smtp_confirmation+tls_peerdn - -queue_only -queue_run_in_order - -tls_advertise_hosts = * -tls_require_ciphers = NORMAL:!DHE-RSA:!DHE-DSS:!ECDHE-RSA:!ECDHE-ECDSA:!ECDHE-PSK - -# Set certificate only if server - -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} -tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} - - -# ----- Routers ----- - -begin routers - -client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} - retry_use_local_part - transport = send_to_server${if eq{$local_part}{abcd}{2}{1}} - -server: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - -send_to_server1: - driver = smtp - allow_localhost - hosts = 127.0.0.1 - port = PORT_D - hosts_try_fastopen = : - -send_to_server2: - driver = smtp - allow_localhost - hosts = HOSTIPV4 - port = PORT_D - hosts_try_fastopen = : - -# End diff --git a/test/confs/2008 b/test/confs/2008 deleted file mode 100644 index 0fd5186ac..000000000 --- a/test/confs/2008 +++ /dev/null @@ -1,86 +0,0 @@ -# Exim test configuration 2008 - -SERVER = - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - - -# ----- Main settings ----- - -domainlist local_domains = test.ex : *.test.ex - -acl_smtp_rcpt = check_recipient -log_selector = +tls_peerdn -queue_only -queue_run_in_order -remote_max_parallel = 1 - -tls_advertise_hosts = * - -# Set certificate only if server - -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} - - -# ------ ACL ------ - -begin acl - -check_recipient: - accept domains = +local_domains - deny message = relay not permitted - - -# ----- Routers ----- - -begin routers - -client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} - retry_use_local_part - transport = send_to_server${if eq{$local_part}{abcd}{2}{1}} - -server: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - -send_to_server1: - driver = smtp - allow_localhost - hosts = 127.0.0.1 - port = PORT_D - hosts_try_fastopen = : - helo_data = helo.data.changed - -send_to_server2: - driver = smtp - allow_localhost - hosts = HOSTIPV4 - port = PORT_D - hosts_try_fastopen = : - - -# ----- Retry ----- - - -begin retry - -* * F,5d,10s - - -# End diff --git a/test/confs/2009 b/test/confs/2009 deleted file mode 100644 index 21f9f2673..000000000 --- a/test/confs/2009 +++ /dev/null @@ -1,61 +0,0 @@ -# Exim test configuration 2009 - -SERVER = - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = check_recipient -hostlist tls_hosts = 127.0.0.1 - -queue_only -queue_run_in_order - -tls_advertise_hosts = * - -# Set certificate only if server - -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} -tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} - - - -# ----- ACL ----- - -begin acl - -check_recipient: - deny hosts = +tls_hosts - message = encryption required - !encrypted = * - accept domains = +local_domains - deny message = relay not permitted - - -# ----- Routers ----- - -begin routers - -client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} - retry_use_local_part - transport = send_to_server - - -# ----- Transports ----- - -begin transports - -send_to_server: - driver = smtp - allow_localhost - hosts = 127.0.0.1 - port = PORT_D - hosts_try_fastopen = : - hosts_avoid_tls = 127.0.0.1 - -# End diff --git a/test/confs/2013 b/test/confs/2013 deleted file mode 100644 index d81f160de..000000000 --- a/test/confs/2013 +++ /dev/null @@ -1,74 +0,0 @@ -# Exim test configuration 2013 - -SERVER = -PEX = : - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = accept - -log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients - -queue_only -queue_run_in_order - -smtp_accept_max_nonmail = 0 - -tls_advertise_hosts = * - -# Set certificate only if server - -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} -tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} - - -# ----- Routers ----- - -begin routers - -.ifdef REQUIRE -cl_override: - driver = manualroute - route_data = HOSTIPV4 - retry_use_local_part - transport = send_to_server - self = send -.endif - -client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} - retry_use_local_part - transport = send_to_server - -server: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - -send_to_server: - driver = smtp - allow_localhost - hosts_override - hosts = 127.0.0.1 - port = PORT_D - hosts_try_fastopen = : - hosts_noproxy_tls = PEX - tls_try_verify_hosts = : - -# End diff --git a/test/confs/2016 b/test/confs/2016 deleted file mode 100644 index ead3a903b..000000000 --- a/test/confs/2016 +++ /dev/null @@ -1,43 +0,0 @@ -# Exim test configuration 2016 - -.include DIR/aux-var/std_conf_prefix - - -# ----- Main settings ----- - -qualify_domain = test.ex - - -# ----- Routers ----- - -begin routers - -others: - driver = manualroute - route_list = * 127.0.0.1 byname - self = send - transport = smtp - no_more - - -# ----- Transports ----- - -begin transports - -smtp: - driver = smtp - command_timeout = 1s - hosts_require_tls = 127.0.0.1 - port = PORT_S - hosts_try_fastopen = : - - -# ----- Retry ----- - - -begin retry - -* * F,5d,1d - - -# End diff --git a/test/confs/2017 b/test/confs/2017 deleted file mode 100644 index 01612ef72..000000000 --- a/test/confs/2017 +++ /dev/null @@ -1,69 +0,0 @@ -# Exim test configuration 2017 - -SERVER = - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = accept - -log_selector = +tls_peerdn - -queue_only -queue_run_in_order - -tls_advertise_hosts = * - -# Set certificate only if server - -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} -tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} - - -# ----- Routers ----- - -begin routers - -client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} - retry_use_local_part - transport = send_to_server - -server: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - -send_to_server: - driver = smtp - allow_localhost - hosts = 127.0.0.1 - port = PORT_D - hosts_try_fastopen = : - hosts_nopass_tls = * - - -# ----- Retry ----- - - -begin retry - -* * F,5d,10s - - -# End diff --git a/test/confs/2021 b/test/confs/2021 deleted file mode 100644 index a7e89f8da..000000000 --- a/test/confs/2021 +++ /dev/null @@ -1,44 +0,0 @@ -# Exim test configuration 2021 - -REQUIRE=# -TRYCLEAR=# - -.include DIR/aux-var/std_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - - -# ----- Routers ----- - -begin routers - -client: - driver = accept - transport = send_to_server - - -# ----- Transports ----- - -begin transports - -send_to_server: - driver = smtp - allow_localhost - hosts = 127.0.0.1 - port = PORT_S - hosts_try_fastopen = : - REQUIRE - TRYCLEAR - - -# ----- Retry ----- - - -begin retry - -* * F,5d,10s - - -# End diff --git a/test/confs/2033 b/test/confs/2033 index 15e632a57..8fa51d0e9 100644 --- a/test/confs/2033 +++ b/test/confs/2033 @@ -1,4 +1,4 @@ -# Exim test configuration 2033 +# Exim test configuration 1162 # TLS client: verify certificate from server - name-fails SERVER= @@ -81,7 +81,7 @@ client_r: client_s: driver = accept - local_parts = users + local_parts = user_s retry_use_local_part transport = send_to_server_req_passname diff --git a/test/confs/2038 b/test/confs/2038 deleted file mode 100644 index 677bc9ee3..000000000 --- a/test/confs/2038 +++ /dev/null @@ -1,64 +0,0 @@ -# Exim test configuration 2035 - -SERVER = - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = accept - -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 - -tls_advertise_hosts = * - -# Set certificate only if server - -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} -tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} - - -# ----- Routers ----- - -begin routers - -client: - driver = manualroute - condition = ${if eq {SERVER}{server}{no}{yes}} - route_data = 127.0.0.1 - self = send - retry_use_local_part - transport = send_to_server - -server: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - -send_to_server: - driver = smtp - allow_localhost - hosts_noproxy_tls = : - port = PORT_D - max_rcpt = 1 - -# End diff --git a/test/confs/2051 b/test/confs/2051 deleted file mode 120000 index cde0a73c4..000000000 --- a/test/confs/2051 +++ /dev/null @@ -1 +0,0 @@ -2151 \ No newline at end of file diff --git a/test/confs/2091 b/test/confs/2091 deleted file mode 120000 index 1bb987150..000000000 --- a/test/confs/2091 +++ /dev/null @@ -1 +0,0 @@ -0900 \ No newline at end of file diff --git a/test/confs/2107 b/test/confs/2107 deleted file mode 100644 index 1f96800e3..000000000 --- a/test/confs/2107 +++ /dev/null @@ -1,66 +0,0 @@ -# Exim test configuration 2107 - -SERVER = - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = accept - -log_selector = +smtp_confirmation+tls_peerdn - -queue_only -queue_run_in_order - -tls_advertise_hosts = * - -# Set certificate only if server - -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} -tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} - - -# ----- Routers ----- - -begin routers - -client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} - retry_use_local_part - transport = send_to_server${if eq{$local_part}{abcd}{2}{1}} - -server: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - -send_to_server1: - driver = smtp - allow_localhost - hosts = 127.0.0.1 - port = PORT_D - hosts_try_fastopen = : - -send_to_server2: - driver = smtp - allow_localhost - hosts = HOSTIPV4 - port = PORT_D - hosts_try_fastopen = : - -# End diff --git a/test/confs/2108 b/test/confs/2108 deleted file mode 100644 index c9720e46a..000000000 --- a/test/confs/2108 +++ /dev/null @@ -1,84 +0,0 @@ -# Exim test configuration 2108 - -SERVER = - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -domainlist local_domains = test.ex : *.test.ex - -acl_smtp_rcpt = check_recipient -log_selector = +tls_peerdn -queue_only -queue_run_in_order -remote_max_parallel = 1 - -tls_advertise_hosts = * - -# Set certificate only if server - -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} - -# ------ ACL ------ - -begin acl - -check_recipient: - accept domains = +local_domains - deny message = relay not permitted - - -# ----- Routers ----- - -begin routers - -client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} - retry_use_local_part - transport = send_to_server${if eq{$local_part}{abcd}{2}{1}} - -server: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - -send_to_server1: - driver = smtp - allow_localhost - hosts = 127.0.0.1 - port = PORT_D - hosts_try_fastopen = : - helo_data = helo.data.changed - -send_to_server2: - driver = smtp - allow_localhost - hosts = HOSTIPV4 - port = PORT_D - hosts_try_fastopen = : - - -# ----- Retry ----- - - -begin retry - -* * F,5d,10s - - -# End diff --git a/test/confs/2109 b/test/confs/2109 deleted file mode 100644 index 3f1465fa2..000000000 --- a/test/confs/2109 +++ /dev/null @@ -1,61 +0,0 @@ -# Exim test configuration 2109 - -SERVER = - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = check_recipient -hostlist tls_hosts = 127.0.0.1 - -queue_only -queue_run_in_order - -tls_advertise_hosts = * - -# Set certificate only if server - -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} -tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} - - - -# ----- ACL ----- - -begin acl - -check_recipient: - deny hosts = +tls_hosts - message = encryption required - !encrypted = * - accept domains = +local_domains - deny message = relay not permitted - - -# ----- Routers ----- - -begin routers - -client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} - retry_use_local_part - transport = send_to_server - - -# ----- Transports ----- - -begin transports - -send_to_server: - driver = smtp - allow_localhost - hosts = 127.0.0.1 - port = PORT_D - hosts_try_fastopen = : - hosts_avoid_tls = 127.0.0.1 - -# End diff --git a/test/confs/2113 b/test/confs/2113 deleted file mode 100644 index b992747e2..000000000 --- a/test/confs/2113 +++ /dev/null @@ -1,72 +0,0 @@ -# Exim test configuration 2113 - -SERVER = -PEX = : - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = accept - -log_selector = +tls_peerdn+smtp_connection+incoming_port+received_recipients - -queue_only -queue_run_in_order - -smtp_accept_max_nonmail = 0 - -tls_advertise_hosts = * - -tls_certificate = DIR/aux-fixed/cert1 - - -# ----- Routers ----- - -begin routers - -.ifdef REQUIRE -cl_override: - driver = manualroute - route_data = HOSTIPV4 - retry_use_local_part - transport = send_to_server - self = send -.endif - -client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} - retry_use_local_part - transport = send_to_server - -server: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - -send_to_server: - driver = smtp - allow_localhost - hosts_override - hosts = 127.0.0.1 - port = PORT_D - hosts_try_fastopen = : - hosts_noproxy_tls = PEX - tls_verify_certificates = DIR/aux-fixed/cert1 - tls_verify_cert_hostnames = : - -# End diff --git a/test/confs/2116 b/test/confs/2116 deleted file mode 100644 index 77a671261..000000000 --- a/test/confs/2116 +++ /dev/null @@ -1,43 +0,0 @@ -# Exim test configuration 2116 - -.include DIR/aux-var/std_conf_prefix - - -# ----- Main settings ----- - -qualify_domain = test.ex - - -# ----- Routers ----- - -begin routers - -others: - driver = manualroute - route_list = * 127.0.0.1 byname - self = send - transport = smtp - no_more - - -# ----- Transports ----- - -begin transports - -smtp: - driver = smtp - command_timeout = 1s - port = PORT_S - hosts_try_fastopen = : - hosts_require_tls = 127.0.0.1 - - -# ----- Retry ----- - - -begin retry - -* * F,5d,1d - - -# End diff --git a/test/confs/2117 b/test/confs/2117 deleted file mode 100644 index 16429f1a4..000000000 --- a/test/confs/2117 +++ /dev/null @@ -1,67 +0,0 @@ -# Exim test configuration 2117 - -SERVER = - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = accept - -log_selector = +tls_peerdn - -queue_only -queue_run_in_order - -tls_advertise_hosts = * -tls_certificate = DIR/aux-fixed/cert1 - - -# ----- Routers ----- - -begin routers - -client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} - retry_use_local_part - transport = send_to_server - -server: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - -send_to_server: - driver = smtp - allow_localhost - hosts = 127.0.0.1 - port = PORT_D - hosts_try_fastopen = : - tls_verify_certificates = DIR/aux-fixed/cert1 - tls_verify_cert_hostnames = : - hosts_nopass_tls = * - - -# ----- Retry ----- - - -begin retry - -* * F,5d,10s - - -# End diff --git a/test/confs/2121 b/test/confs/2121 deleted file mode 100644 index 6dcaa0577..000000000 --- a/test/confs/2121 +++ /dev/null @@ -1,44 +0,0 @@ -# Exim test configuration 2121 - -REQUIRE=# -TRYCLEAR=# - -.include DIR/aux-var/std_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - - -# ----- Routers ----- - -begin routers - -client: - driver = accept - transport = send_to_server - - -# ----- Transports ----- - -begin transports - -send_to_server: - driver = smtp - allow_localhost - hosts = 127.0.0.1 - port = PORT_S - hosts_try_fastopen = : - REQUIRE - TRYCLEAR - - -# ----- Retry ----- - - -begin retry - -* * F,5d,10s - - -# End diff --git a/test/confs/2133 b/test/confs/2133 index 463e614ca..8fa51d0e9 100644 --- a/test/confs/2133 +++ b/test/confs/2133 @@ -1,4 +1,4 @@ -# Exim test configuration 2133 +# Exim test configuration 1162 # TLS client: verify certificate from server - name-fails SERVER= @@ -91,7 +91,6 @@ client_t: retry_use_local_part transport = send_to_server_req_failcarryon - # ----- Transports ----- begin transports @@ -181,6 +180,8 @@ send_to_server_req_passname: tls_verify_cert_hostnames = * tls_verify_hosts = * +# this will fail to verify the cert name but carry on (try-verify mode) +# fail because the cert is "server1.example.com" and the test system is something else send_to_server_req_failcarryon: driver = smtp allow_localhost diff --git a/test/confs/2138 b/test/confs/2138 deleted file mode 100644 index c255373b5..000000000 --- a/test/confs/2138 +++ /dev/null @@ -1,63 +0,0 @@ -# Exim test configuration 2135 - -SERVER = - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = accept - -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 - -tls_advertise_hosts = * -tls_certificate = DIR/aux-fixed/cert1 - - -# ----- Routers ----- - -begin routers - -client: - driver = manualroute - condition = ${if eq {SERVER}{server}{no}{yes}} - route_data = 127.0.0.1 - self = send - retry_use_local_part - transport = send_to_server - -server: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - -send_to_server: - driver = smtp - allow_localhost - port = PORT_D - hosts_try_fastopen = : - hosts_noproxy_tls = : - tls_verify_certificates = DIR/aux-fixed/cert1 - tls_verify_cert_hostnames = : - max_rcpt = 1 - -# End diff --git a/test/confs/2151 b/test/confs/2151 deleted file mode 100644 index 1e40a83ae..000000000 --- a/test/confs/2151 +++ /dev/null @@ -1,44 +0,0 @@ -# Exim test configuration 2151 - -.include DIR/aux-var/tls_conf_prefix - - -# ----- Main settings ----- - -acl_smtp_rcpt = acl_rcpt -callout_random_local_part = $primary_hostname--testing -trusted_users = CALLER - -tls_advertise_hosts = 127.0.0.1 : HOSTIPV4 - -tls_certificate = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem -tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key - -# ----- ACL ----- - -begin acl - -acl_rcpt: - accept verify = recipient/callout=1s,use_sender - -# ----- Routers ----- - -begin routers - -callout: - driver = manualroute - transport = smtp - route_data = 127.0.0.1 - self = send - - -# ----- Transports ----- - -begin transports - -smtp: - driver = smtp - port = PORT_S - hosts_try_fastopen = : - -# End diff --git a/test/confs/2191 b/test/confs/2191 deleted file mode 120000 index 1bb987150..000000000 --- a/test/confs/2191 +++ /dev/null @@ -1 +0,0 @@ -0900 \ No newline at end of file diff --git a/test/log/1103 b/test/log/1103 deleted file mode 100644 index 28d97d389..000000000 --- a/test/log/1103 +++ /dev/null @@ -1,9 +0,0 @@ -2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss - -******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, -q7s, listening for SMTP on port PORT_D -2017-07-30 18:51:05.712 Start queue run: pid=pppp -2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes S=sss id=E10HmaX-0005vi-00@myhost.test.ex -2017-07-30 18:51:05.712 10HmaX-0005vi-00 => test@example.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaY-0005vi-00" -2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed -2017-07-30 18:51:05.712 End queue run: pid=pppp diff --git a/test/log/1150 b/test/log/1150 new file mode 100644 index 000000000..00415d39a --- /dev/null +++ b/test/log/1150 @@ -0,0 +1,25 @@ +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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER R=server T=local_delivery +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER R=server T=local_delivery +1999-03-02 09:44:33 10HmbA-0005vi-00 => xyz R=server T=local_delivery +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 10HmbB-0005vi-00 => abcd R=server T=local_delivery +1999-03-02 09:44:33 10HmbB-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf diff --git a/test/log/1151 b/test/log/1151 new file mode 100644 index 000000000..28d97d389 --- /dev/null +++ b/test/log/1151 @@ -0,0 +1,9 @@ +2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss + +******** SERVER ******** +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, -q7s, listening for SMTP on port PORT_D +2017-07-30 18:51:05.712 Start queue run: pid=pppp +2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes S=sss id=E10HmaX-0005vi-00@myhost.test.ex +2017-07-30 18:51:05.712 10HmaX-0005vi-00 => test@example.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaY-0005vi-00" +2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed +2017-07-30 18:51:05.712 End queue run: pid=pppp diff --git a/test/log/1152 b/test/log/1152 new file mode 100644 index 000000000..ae8d0d11e --- /dev/null +++ b/test/log/1152 @@ -0,0 +1,9 @@ +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 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/1153 b/test/log/1153 new file mode 100644 index 000000000..1e0ec19d6 --- /dev/null +++ b/test/log/1153 @@ -0,0 +1,10 @@ +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 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 encryption required +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F= rejected RCPT : encryption required diff --git a/test/log/1157 b/test/log/1157 new file mode 100644 index 000000000..7c8e6e80f --- /dev/null +++ b/test/log/1157 @@ -0,0 +1,69 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery@test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz@test.ex +1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usera@test.ex +1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userb@test.ex +1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userc@test.ex +1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 10HmbD-0005vi-00 => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbG-0005vi-00" +1999-03-02 09:44:33 10HmbD-0005vi-00 Completed +1999-03-02 09:44:33 10HmbF-0005vi-00 => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00" +1999-03-02 09:44:33 10HmbF-0005vi-00 Completed +1999-03-02 09:44:33 10HmbE-0005vi-00 => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00" +1999-03-02 09:44:33 10HmbE-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qqf +1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx@test.ex +1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery@test.ex +1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz@test.ex +1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbM-0005vi-00" +1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed +1999-03-02 09:44:33 10HmbL-0005vi-00 => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbN-0005vi-00" +1999-03-02 09:44:33 10HmbL-0005vi-00 Completed +1999-03-02 09:44:33 10HmbK-0005vi-00 => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbO-0005vi-00" +1999-03-02 09:44:33 10HmbK-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qqf + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1111 (TCP/IP connection count = 1) +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx@test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz@test.ex +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery@test.ex +1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1111 closed by QUIT +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbA-0005vi-00 => userx R=server T=local_delivery +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 10HmbB-0005vi-00 => userz R=server T=local_delivery +1999-03-02 09:44:33 10HmbB-0005vi-00 Completed +1999-03-02 09:44:33 10HmbC-0005vi-00 => usery R=server T=local_delivery +1999-03-02 09:44:33 10HmbC-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1112 (TCP/IP connection count = 1) +1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex for usera@test.ex +1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbF-0005vi-00@myhost.test.ex for userc@test.ex +1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbE-0005vi-00@myhost.test.ex for userb@test.ex +1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1112 closed by QUIT +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbG-0005vi-00 => usera R=server T=local_delivery +1999-03-02 09:44:33 10HmbG-0005vi-00 Completed +1999-03-02 09:44:33 10HmbH-0005vi-00 => userc R=server T=local_delivery +1999-03-02 09:44:33 10HmbH-0005vi-00 Completed +1999-03-02 09:44:33 10HmbI-0005vi-00 => userb R=server T=local_delivery +1999-03-02 09:44:33 10HmbI-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1113 (TCP/IP connection count = 1) +1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbJ-0005vi-00@myhost.test.ex for userx@test.ex +1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbL-0005vi-00@myhost.test.ex for userz@test.ex +1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbK-0005vi-00@myhost.test.ex for usery@test.ex +1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1113 closed by QUIT diff --git a/test/log/1158 b/test/log/1158 new file mode 100644 index 000000000..876c8b236 --- /dev/null +++ b/test/log/1158 @@ -0,0 +1,2 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (tls lib connect fn): timed out diff --git a/test/log/1159 b/test/log/1159 new file mode 100644 index 000000000..94040ba1b --- /dev/null +++ b/test/log/1159 @@ -0,0 +1,19 @@ +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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qqf + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx R=server T=local_delivery +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 10HmbA-0005vi-00 => userx R=server T=local_delivery +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf diff --git a/test/log/1161 b/test/log/1161 new file mode 100644 index 000000000..59e8330bf --- /dev/null +++ b/test/log/1161 @@ -0,0 +1,10 @@ +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 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem +1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=client T=send_to_server defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed +1999-03-02 09:44:33 10HmaY-0005vi-00 == x@y R=client T=send_to_server defer (-38) H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed diff --git a/test/log/1163 b/test/log/1163 new file mode 100644 index 000000000..63f6c3f7a --- /dev/null +++ b/test/log/1163 @@ -0,0 +1,41 @@ +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 +1999-03-02 09:44:33 Start queue run: pid=pppp -qqf +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbD-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 => usery0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbE-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 => usery1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbF-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qqf + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1111 (TCP/IP connection count = 1) +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx0@test.ex +1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1112 (TCP/IP connection count = 2) +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx1@test.ex +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz0@test.ex +1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz1@test.ex +1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1111 closed by QUIT +1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery0@test.ex +1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery1@test.ex +1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1112 closed by QUIT +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbA-0005vi-00 => userx0 R=server T=local_delivery +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 10HmbB-0005vi-00 => userx1 R=server T=local_delivery +1999-03-02 09:44:33 10HmbB-0005vi-00 Completed +1999-03-02 09:44:33 10HmbC-0005vi-00 => userz0 R=server T=local_delivery +1999-03-02 09:44:33 10HmbC-0005vi-00 Completed +1999-03-02 09:44:33 10HmbD-0005vi-00 => userz1 R=server T=local_delivery +1999-03-02 09:44:33 10HmbD-0005vi-00 Completed +1999-03-02 09:44:33 10HmbE-0005vi-00 => usery0 R=server T=local_delivery +1999-03-02 09:44:33 10HmbE-0005vi-00 Completed +1999-03-02 09:44:33 10HmbF-0005vi-00 => usery1 R=server T=local_delivery +1999-03-02 09:44:33 10HmbF-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf diff --git a/test/log/1164 b/test/log/1164 new file mode 100644 index 000000000..6b522e9c9 --- /dev/null +++ b/test/log/1164 @@ -0,0 +1,2 @@ +1999-03-02 09:44:33 TLS session: (tls lib connect fn): timed out: callout unencrypted to 127.0.0.1 [127.0.0.1] (not in hosts_require_tls) +1999-03-02 09:44:33 10HmaX-0005vi-00 <= s1@test.ex U=CALLER P=local-esmtp S=sss diff --git a/test/log/1165 b/test/log/1165 new file mode 100644 index 000000000..e35fd544f --- /dev/null +++ b/test/log/1165 @@ -0,0 +1,7 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= this-user@testhost.test.ex U=this-user P=local S=sss for other-user@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 => other-user@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-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 PORT_S +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmaX-0005vi-00@testhost.test.ex for other-user@test.ex diff --git a/test/log/2007 b/test/log/2007 deleted file mode 100644 index dfcb3c3b3..000000000 --- a/test/log/2007 +++ /dev/null @@ -1,9 +0,0 @@ -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 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx 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 End queue run: pid=pppp -qf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/2008 b/test/log/2008 deleted file mode 100644 index 1f8c15cd8..000000000 --- a/test/log/2008 +++ /dev/null @@ -1,25 +0,0 @@ -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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER R=server T=local_delivery -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER R=server T=local_delivery -1999-03-02 09:44:33 10HmbA-0005vi-00 => xyz R=server T=local_delivery -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 => abcd R=server T=local_delivery -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf diff --git a/test/log/2009 b/test/log/2009 deleted file mode 100644 index 1e0ec19d6..000000000 --- a/test/log/2009 +++ /dev/null @@ -1,10 +0,0 @@ -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 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 encryption required -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F= rejected RCPT : encryption required diff --git a/test/log/2013 b/test/log/2013 deleted file mode 100644 index d23565e3a..000000000 --- a/test/log/2013 +++ /dev/null @@ -1,69 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery@test.ex -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00" -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usera@test.ex -1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userb@test.ex -1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userc@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmbD-0005vi-00 => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00" -1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 10HmbF-0005vi-00 => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00" -1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 10HmbE-0005vi-00 => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00" -1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx@test.ex -1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery@test.ex -1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00" -1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbL-0005vi-00 => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00" -1999-03-02 09:44:33 10HmbL-0005vi-00 Completed -1999-03-02 09:44:33 10HmbK-0005vi-00 => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbO-0005vi-00" -1999-03-02 09:44:33 10HmbK-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1111 (TCP/IP connection count = 1) -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx@test.ex -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz@test.ex -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery@test.ex -1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1111 closed by QUIT -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmbA-0005vi-00 => userx R=server T=local_delivery -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 => userz R=server T=local_delivery -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 10HmbC-0005vi-00 => usery R=server T=local_delivery -1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1112 (TCP/IP connection count = 1) -1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex for usera@test.ex -1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbF-0005vi-00@myhost.test.ex for userc@test.ex -1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbE-0005vi-00@myhost.test.ex for userb@test.ex -1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1112 closed by QUIT -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmbG-0005vi-00 => usera R=server T=local_delivery -1999-03-02 09:44:33 10HmbG-0005vi-00 Completed -1999-03-02 09:44:33 10HmbH-0005vi-00 => userc R=server T=local_delivery -1999-03-02 09:44:33 10HmbH-0005vi-00 Completed -1999-03-02 09:44:33 10HmbI-0005vi-00 => userb R=server T=local_delivery -1999-03-02 09:44:33 10HmbI-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1113 (TCP/IP connection count = 1) -1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbJ-0005vi-00@myhost.test.ex for userx@test.ex -1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbL-0005vi-00@myhost.test.ex for userz@test.ex -1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbK-0005vi-00@myhost.test.ex for usery@test.ex -1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1113 closed by QUIT diff --git a/test/log/2016 b/test/log/2016 deleted file mode 100644 index 039002bb0..000000000 --- a/test/log/2016 +++ /dev/null @@ -1,2 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (gnutls_handshake): timed out diff --git a/test/log/2017 b/test/log/2017 deleted file mode 100644 index 738e6620d..000000000 --- a/test/log/2017 +++ /dev/null @@ -1,19 +0,0 @@ -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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx R=server T=local_delivery -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbA-0005vi-00 => userx R=server T=local_delivery -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf diff --git a/test/log/2021 b/test/log/2021 deleted file mode 100644 index 59e8330bf..000000000 --- a/test/log/2021 +++ /dev/null @@ -1,10 +0,0 @@ -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 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem -1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=client T=send_to_server defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed -1999-03-02 09:44:33 10HmaY-0005vi-00 == x@y R=client T=send_to_server defer (-38) H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed diff --git a/test/log/2033 b/test/log/2033 index d0a860e80..8757949cb 100644 --- a/test/log/2033 +++ b/test/log/2033 @@ -1,19 +1,25 @@ 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 10HmaY-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 +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session: (certificate verification failed): delivering unencrypted to H=the.local.host.name [ip4.ip4.ip4.ip4] (not in hosts_require_tls) -1999-03-02 09:44:33 10HmaX-0005vi-00 => userr@test.ex R=client_r T=send_to_server_req_failname H=the.local.host.name [ip4.ip4.ip4.ip4] C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session: (certificate verification failed): certificate invalid: delivering unencrypted to H=the.local.host.name [ip4.ip4.ip4.ip4] (not in hosts_require_tls) +1999-03-02 09:44:33 10HmaX-0005vi-00 => userq@test.ex R=client_q T=send_to_server_req_fail H=the.local.host.name [ip4.ip4.ip4.ip4] C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => users@test.ex R=client_s T=send_to_server_req_passname H=server1.example.com [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server1.example.com" C="250 OK id=10HmbB-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 TLS session: (certificate verification failed): delivering unencrypted to H=the.local.host.name [ip4.ip4.ip4.ip4] (not in hosts_require_tls) +1999-03-02 09:44:33 10HmaY-0005vi-00 => userr@test.ex R=client_r T=send_to_server_req_failname H=the.local.host.name [ip4.ip4.ip4.ip4] C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 => usert@test.ex R=client_t T=send_to_server_req_failcarryon H=the.local.host.name [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 => user_s@test.ex R=client_s T=send_to_server_req_passname H=server1.example.com [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server1.example.com" C="250 OK id=10HmbD-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 10HmbA-0005vi-00 => usert@test.ex R=client_t T=send_to_server_req_failcarryon H=the.local.host.name [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00" +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp -qf ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 TLS error on connection from the.local.host.name [ip4.ip4.ip4.ip4] (recv): A TLS fatal alert has been received: Certificate is bad -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=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" S=sss id=E10HmaZ-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 TLS error on connection from the.local.host.name [ip4.ip4.ip4.ip4] (recv): A TLS fatal alert has been received: Certificate is bad +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" S=sss id=E10HmaZ-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" S=sss id=E10HmbA-0005vi-00@myhost.test.ex diff --git a/test/log/2038 b/test/log/2038 deleted file mode 100644 index cd177be59..000000000 --- a/test/log/2038 +++ /dev/null @@ -1,41 +0,0 @@ -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 -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbD-0005vi-00" -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => usery0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbE-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 => usery1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbF-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1111 (TCP/IP connection count = 1) -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx0@test.ex -1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1112 (TCP/IP connection count = 2) -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx1@test.ex -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz0@test.ex -1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz1@test.ex -1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1111 closed by QUIT -1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery0@test.ex -1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery1@test.ex -1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1112 closed by QUIT -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmbA-0005vi-00 => userx0 R=server T=local_delivery -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 => userx1 R=server T=local_delivery -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 10HmbC-0005vi-00 => userz0 R=server T=local_delivery -1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 10HmbD-0005vi-00 => userz1 R=server T=local_delivery -1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 10HmbE-0005vi-00 => usery0 R=server T=local_delivery -1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 10HmbF-0005vi-00 => usery1 R=server T=local_delivery -1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf diff --git a/test/log/2051 b/test/log/2051 deleted file mode 100644 index e59a2819b..000000000 --- a/test/log/2051 +++ /dev/null @@ -1,2 +0,0 @@ -1999-03-02 09:44:33 TLS session: (gnutls_handshake): timed out: callout unencrypted to 127.0.0.1 [127.0.0.1] (not in hosts_require_tls) -1999-03-02 09:44:33 10HmaX-0005vi-00 <= s1@test.ex U=CALLER P=local-esmtp S=sss diff --git a/test/log/2091 b/test/log/2091 deleted file mode 100644 index 417da83a8..000000000 --- a/test/log/2091 +++ /dev/null @@ -1,7 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= this-user@testhost.test.ex U=this-user P=local S=sss for other-user@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 => other-user@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmaY-0005vi-00" -1999-03-02 09:44:33 10HmaX-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 PORT_S -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmaX-0005vi-00@testhost.test.ex for other-user@test.ex diff --git a/test/log/2107 b/test/log/2107 deleted file mode 100644 index 05b44d05b..000000000 --- a/test/log/2107 +++ /dev/null @@ -1,11 +0,0 @@ -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 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock -1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1" -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx 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 End queue run: pid=pppp -qf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/2108 b/test/log/2108 deleted file mode 100644 index 4ae01f0bf..000000000 --- a/test/log/2108 +++ /dev/null @@ -1,31 +0,0 @@ -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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock -1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1" -1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock -1999-03-02 09:44:33 10HmaY-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1" -1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock -1999-03-02 09:44:33 10HmaY-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="ip4.ip4.ip4.ip4" -1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER R=server T=local_delivery -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER R=server T=local_delivery -1999-03-02 09:44:33 10HmbA-0005vi-00 => xyz R=server T=local_delivery -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 => abcd R=server T=local_delivery -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf diff --git a/test/log/2109 b/test/log/2109 deleted file mode 100644 index 1e0ec19d6..000000000 --- a/test/log/2109 +++ /dev/null @@ -1,10 +0,0 @@ -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 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 encryption required -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F= rejected RCPT : encryption required diff --git a/test/log/2113 b/test/log/2113 deleted file mode 100644 index aaa72e806..000000000 --- a/test/log/2113 +++ /dev/null @@ -1,69 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery@test.ex -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00" -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usera@test.ex -1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userb@test.ex -1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userc@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmbD-0005vi-00 => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00" -1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 10HmbF-0005vi-00 => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00" -1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 10HmbE-0005vi-00 => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00" -1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userx@test.ex -1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery@test.ex -1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz@test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00" -1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbL-0005vi-00 => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00" -1999-03-02 09:44:33 10HmbL-0005vi-00 Completed -1999-03-02 09:44:33 10HmbK-0005vi-00 => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbO-0005vi-00" -1999-03-02 09:44:33 10HmbK-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1111 (TCP/IP connection count = 1) -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx@test.ex -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz@test.ex -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery@test.ex -1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1111 closed by QUIT -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmbA-0005vi-00 => userx R=server T=local_delivery -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 => userz R=server T=local_delivery -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 10HmbC-0005vi-00 => usery R=server T=local_delivery -1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1112 (TCP/IP connection count = 1) -1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex for usera@test.ex -1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbF-0005vi-00@myhost.test.ex for userc@test.ex -1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbE-0005vi-00@myhost.test.ex for userb@test.ex -1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1112 closed by QUIT -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmbG-0005vi-00 => usera R=server T=local_delivery -1999-03-02 09:44:33 10HmbG-0005vi-00 Completed -1999-03-02 09:44:33 10HmbH-0005vi-00 => userc R=server T=local_delivery -1999-03-02 09:44:33 10HmbH-0005vi-00 Completed -1999-03-02 09:44:33 10HmbI-0005vi-00 => userb R=server T=local_delivery -1999-03-02 09:44:33 10HmbI-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1113 (TCP/IP connection count = 1) -1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbJ-0005vi-00@myhost.test.ex for userx@test.ex -1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbL-0005vi-00@myhost.test.ex for userz@test.ex -1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbK-0005vi-00@myhost.test.ex for usery@test.ex -1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1113 closed by QUIT diff --git a/test/log/2116 b/test/log/2116 deleted file mode 100644 index 32596c206..000000000 --- a/test/log/2116 +++ /dev/null @@ -1,2 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (SSL_connect): timed out diff --git a/test/log/2117 b/test/log/2117 deleted file mode 100644 index 2ecbfec15..000000000 --- a/test/log/2117 +++ /dev/null @@ -1,19 +0,0 @@ -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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx R=server T=local_delivery -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbA-0005vi-00 => userx R=server T=local_delivery -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf diff --git a/test/log/2121 b/test/log/2121 deleted file mode 100644 index 59e8330bf..000000000 --- a/test/log/2121 +++ /dev/null @@ -1,10 +0,0 @@ -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 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem -1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=client T=send_to_server defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed -1999-03-02 09:44:33 10HmaY-0005vi-00 == x@y R=client T=send_to_server defer (-38) H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed diff --git a/test/log/2138 b/test/log/2138 deleted file mode 100644 index decd0debe..000000000 --- a/test/log/2138 +++ /dev/null @@ -1,41 +0,0 @@ -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 -1999-03-02 09:44:33 Start queue run: pid=pppp -qqf -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbD-0005vi-00" -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => usery0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbE-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 => usery1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbF-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qqf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1111 (TCP/IP connection count = 1) -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx0@test.ex -1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1112 (TCP/IP connection count = 2) -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx1@test.ex -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz0@test.ex -1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz1@test.ex -1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1111 closed by QUIT -1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery0@test.ex -1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery1@test.ex -1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1112 closed by QUIT -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmbA-0005vi-00 => userx0 R=server T=local_delivery -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 => userx1 R=server T=local_delivery -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 10HmbC-0005vi-00 => userz0 R=server T=local_delivery -1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 10HmbD-0005vi-00 => userz1 R=server T=local_delivery -1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 10HmbE-0005vi-00 => usery0 R=server T=local_delivery -1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 10HmbF-0005vi-00 => usery1 R=server T=local_delivery -1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf diff --git a/test/log/2151 b/test/log/2151 deleted file mode 100644 index a649f43e0..000000000 --- a/test/log/2151 +++ /dev/null @@ -1,2 +0,0 @@ -1999-03-02 09:44:33 TLS session: (SSL_connect): timed out: callout unencrypted to 127.0.0.1 [127.0.0.1] (not in hosts_require_tls) -1999-03-02 09:44:33 10HmaX-0005vi-00 <= s1@test.ex U=CALLER P=local-esmtp S=sss diff --git a/test/log/2191 b/test/log/2191 deleted file mode 100644 index 3c3b7ac29..000000000 --- a/test/log/2191 +++ /dev/null @@ -1,9 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= this-user@testhost.test.ex U=this-user P=local S=sss for other-user@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock -1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1" -1999-03-02 09:44:33 10HmaX-0005vi-00 => other-user@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmaY-0005vi-00" -1999-03-02 09:44:33 10HmaX-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 PORT_S -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss id=E10HmaX-0005vi-00@testhost.test.ex for other-user@test.ex diff --git a/test/mail/1150.CALLER b/test/mail/1150.CALLER new file mode 100644 index 000000000..f7669bdbc --- /dev/null +++ b/test/mail/1150.CALLER @@ -0,0 +1,34 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from [127.0.0.1] (helo=helo.data.changed) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmaZ-0005vi-00 + for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message. Contains FF: ÿ + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from [127.0.0.1] (helo=helo.data.changed) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message to two different hosts + diff --git a/test/mail/1150.abcd b/test/mail/1150.abcd new file mode 100644 index 000000000..8a6aae2cc --- /dev/null +++ b/test/mail/1150.abcd @@ -0,0 +1,17 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbB-0005vi-00 + for abcd@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message to two different hosts + diff --git a/test/mail/1150.xyz b/test/mail/1150.xyz new file mode 100644 index 000000000..e304d943c --- /dev/null +++ b/test/mail/1150.xyz @@ -0,0 +1,16 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from [127.0.0.1] (helo=helo.data.changed) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message to two different hosts + diff --git a/test/mail/1157.usera b/test/mail/1157.usera new file mode 100644 index 000000000..8aac112ac --- /dev/null +++ b/test/mail/1157.usera @@ -0,0 +1,18 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbG-0005vi-00 + for usera@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbD-0005vi-00 + for usera@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 1 + diff --git a/test/mail/1157.userb b/test/mail/1157.userb new file mode 100644 index 000000000..0a98cd802 --- /dev/null +++ b/test/mail/1157.userb @@ -0,0 +1,18 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbI-0005vi-00 + for userb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbE-0005vi-00 + for userb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 2 + diff --git a/test/mail/1157.userc b/test/mail/1157.userc new file mode 100644 index 000000000..efb32a668 --- /dev/null +++ b/test/mail/1157.userc @@ -0,0 +1,18 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbH-0005vi-00 + for userc@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbF-0005vi-00 + for userc@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 3 + diff --git a/test/mail/1157.userx b/test/mail/1157.userx new file mode 100644 index 000000000..f720f911a --- /dev/null +++ b/test/mail/1157.userx @@ -0,0 +1,18 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbA-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 1 + diff --git a/test/mail/1157.usery b/test/mail/1157.usery new file mode 100644 index 000000000..32797e12f --- /dev/null +++ b/test/mail/1157.usery @@ -0,0 +1,18 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbC-0005vi-00 + for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaY-0005vi-00 + for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 2 + diff --git a/test/mail/1157.userz b/test/mail/1157.userz new file mode 100644 index 000000000..919c86d23 --- /dev/null +++ b/test/mail/1157.userz @@ -0,0 +1,18 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbB-0005vi-00 + for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaZ-0005vi-00 + for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 3 + diff --git a/test/mail/1159.userx b/test/mail/1159.userx new file mode 100644 index 000000000..1a86c2aa7 --- /dev/null +++ b/test/mail/1159.userx @@ -0,0 +1,36 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1] helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmaZ-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 1 + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1] helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbA-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaY-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 2 + diff --git a/test/mail/1163.userx0 b/test/mail/1163.userx0 new file mode 100644 index 000000000..5d80e9866 --- /dev/null +++ b/test/mail/1163.userx0 @@ -0,0 +1,17 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbA-0005vi-00 + for userx0@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 1 + diff --git a/test/mail/1163.userx1 b/test/mail/1163.userx1 new file mode 100644 index 000000000..1acf09c8f --- /dev/null +++ b/test/mail/1163.userx1 @@ -0,0 +1,17 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbB-0005vi-00 + for userx1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 1 + diff --git a/test/mail/1163.usery0 b/test/mail/1163.usery0 new file mode 100644 index 000000000..6030779c8 --- /dev/null +++ b/test/mail/1163.usery0 @@ -0,0 +1,17 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbE-0005vi-00 + for usery0@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 2 + diff --git a/test/mail/1163.usery1 b/test/mail/1163.usery1 new file mode 100644 index 000000000..e1b08c6ad --- /dev/null +++ b/test/mail/1163.usery1 @@ -0,0 +1,17 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbF-0005vi-00 + for usery1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 2 + diff --git a/test/mail/1163.userz0 b/test/mail/1163.userz0 new file mode 100644 index 000000000..9f4558735 --- /dev/null +++ b/test/mail/1163.userz0 @@ -0,0 +1,17 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbC-0005vi-00 + for userz0@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 3 + diff --git a/test/mail/1163.userz1 b/test/mail/1163.userz1 new file mode 100644 index 000000000..17e3991b0 --- /dev/null +++ b/test/mail/1163.userz1 @@ -0,0 +1,17 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) + (Exim x.yz) + (envelope-from ) + id 10HmbD-0005vi-00 + for userz1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= + +Test message 3 + diff --git a/test/mail/2008.CALLER b/test/mail/2008.CALLER deleted file mode 100644 index f7669bdbc..000000000 --- a/test/mail/2008.CALLER +++ /dev/null @@ -1,34 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from [127.0.0.1] (helo=helo.data.changed) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00 - for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message. Contains FF: ÿ - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from [127.0.0.1] (helo=helo.data.changed) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message to two different hosts - diff --git a/test/mail/2008.abcd b/test/mail/2008.abcd deleted file mode 100644 index 8a6aae2cc..000000000 --- a/test/mail/2008.abcd +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbB-0005vi-00 - for abcd@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message to two different hosts - diff --git a/test/mail/2008.xyz b/test/mail/2008.xyz deleted file mode 100644 index e304d943c..000000000 --- a/test/mail/2008.xyz +++ /dev/null @@ -1,16 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from [127.0.0.1] (helo=helo.data.changed) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message to two different hosts - diff --git a/test/mail/2013.usera b/test/mail/2013.usera deleted file mode 100644 index 8aac112ac..000000000 --- a/test/mail/2013.usera +++ /dev/null @@ -1,18 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbG-0005vi-00 - for usera@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbD-0005vi-00 - for usera@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 1 - diff --git a/test/mail/2013.userb b/test/mail/2013.userb deleted file mode 100644 index 0a98cd802..000000000 --- a/test/mail/2013.userb +++ /dev/null @@ -1,18 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbI-0005vi-00 - for userb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbE-0005vi-00 - for userb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 2 - diff --git a/test/mail/2013.userc b/test/mail/2013.userc deleted file mode 100644 index efb32a668..000000000 --- a/test/mail/2013.userc +++ /dev/null @@ -1,18 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbH-0005vi-00 - for userc@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbF-0005vi-00 - for userc@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 3 - diff --git a/test/mail/2013.userx b/test/mail/2013.userx deleted file mode 100644 index f720f911a..000000000 --- a/test/mail/2013.userx +++ /dev/null @@ -1,18 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 1 - diff --git a/test/mail/2013.usery b/test/mail/2013.usery deleted file mode 100644 index 32797e12f..000000000 --- a/test/mail/2013.usery +++ /dev/null @@ -1,18 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbC-0005vi-00 - for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00 - for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 2 - diff --git a/test/mail/2013.userz b/test/mail/2013.userz deleted file mode 100644 index 919c86d23..000000000 --- a/test/mail/2013.userz +++ /dev/null @@ -1,18 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbB-0005vi-00 - for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00 - for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 3 - diff --git a/test/mail/2017.userx b/test/mail/2017.userx deleted file mode 100644 index 1a86c2aa7..000000000 --- a/test/mail/2017.userx +++ /dev/null @@ -1,36 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 1 - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 2 - diff --git a/test/mail/2038.userx0 b/test/mail/2038.userx0 deleted file mode 100644 index 5d80e9866..000000000 --- a/test/mail/2038.userx0 +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00 - for userx0@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 1 - diff --git a/test/mail/2038.userx1 b/test/mail/2038.userx1 deleted file mode 100644 index 1acf09c8f..000000000 --- a/test/mail/2038.userx1 +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbB-0005vi-00 - for userx1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 1 - diff --git a/test/mail/2038.usery0 b/test/mail/2038.usery0 deleted file mode 100644 index 6030779c8..000000000 --- a/test/mail/2038.usery0 +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbE-0005vi-00 - for usery0@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 2 - diff --git a/test/mail/2038.usery1 b/test/mail/2038.usery1 deleted file mode 100644 index e1b08c6ad..000000000 --- a/test/mail/2038.usery1 +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbF-0005vi-00 - for usery1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 2 - diff --git a/test/mail/2038.userz0 b/test/mail/2038.userz0 deleted file mode 100644 index 9f4558735..000000000 --- a/test/mail/2038.userz0 +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbC-0005vi-00 - for userz0@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 3 - diff --git a/test/mail/2038.userz1 b/test/mail/2038.userz1 deleted file mode 100644 index 17e3991b0..000000000 --- a/test/mail/2038.userz1 +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbD-0005vi-00 - for userz1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 3 - diff --git a/test/mail/2108.CALLER b/test/mail/2108.CALLER deleted file mode 100644 index f7669bdbc..000000000 --- a/test/mail/2108.CALLER +++ /dev/null @@ -1,34 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from [127.0.0.1] (helo=helo.data.changed) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00 - for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message. Contains FF: ÿ - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from [127.0.0.1] (helo=helo.data.changed) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message to two different hosts - diff --git a/test/mail/2108.abcd b/test/mail/2108.abcd deleted file mode 100644 index 8a6aae2cc..000000000 --- a/test/mail/2108.abcd +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbB-0005vi-00 - for abcd@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message to two different hosts - diff --git a/test/mail/2108.xyz b/test/mail/2108.xyz deleted file mode 100644 index e304d943c..000000000 --- a/test/mail/2108.xyz +++ /dev/null @@ -1,16 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from [127.0.0.1] (helo=helo.data.changed) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message to two different hosts - diff --git a/test/mail/2113.usera b/test/mail/2113.usera deleted file mode 100644 index 8aac112ac..000000000 --- a/test/mail/2113.usera +++ /dev/null @@ -1,18 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbG-0005vi-00 - for usera@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbD-0005vi-00 - for usera@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 1 - diff --git a/test/mail/2113.userb b/test/mail/2113.userb deleted file mode 100644 index 0a98cd802..000000000 --- a/test/mail/2113.userb +++ /dev/null @@ -1,18 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbI-0005vi-00 - for userb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbE-0005vi-00 - for userb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 2 - diff --git a/test/mail/2113.userc b/test/mail/2113.userc deleted file mode 100644 index efb32a668..000000000 --- a/test/mail/2113.userc +++ /dev/null @@ -1,18 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbH-0005vi-00 - for userc@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbF-0005vi-00 - for userc@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 3 - diff --git a/test/mail/2113.userx b/test/mail/2113.userx deleted file mode 100644 index f720f911a..000000000 --- a/test/mail/2113.userx +++ /dev/null @@ -1,18 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 1 - diff --git a/test/mail/2113.usery b/test/mail/2113.usery deleted file mode 100644 index 32797e12f..000000000 --- a/test/mail/2113.usery +++ /dev/null @@ -1,18 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbC-0005vi-00 - for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00 - for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 2 - diff --git a/test/mail/2113.userz b/test/mail/2113.userz deleted file mode 100644 index 919c86d23..000000000 --- a/test/mail/2113.userz +++ /dev/null @@ -1,18 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbB-0005vi-00 - for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00 - for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 3 - diff --git a/test/mail/2117.userx b/test/mail/2117.userx deleted file mode 100644 index 1a86c2aa7..000000000 --- a/test/mail/2117.userx +++ /dev/null @@ -1,36 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 1 - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 2 - diff --git a/test/mail/2138.userx0 b/test/mail/2138.userx0 deleted file mode 100644 index 5d80e9866..000000000 --- a/test/mail/2138.userx0 +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00 - for userx0@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 1 - diff --git a/test/mail/2138.userx1 b/test/mail/2138.userx1 deleted file mode 100644 index 1acf09c8f..000000000 --- a/test/mail/2138.userx1 +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbB-0005vi-00 - for userx1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 1 - diff --git a/test/mail/2138.usery0 b/test/mail/2138.usery0 deleted file mode 100644 index 6030779c8..000000000 --- a/test/mail/2138.usery0 +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbE-0005vi-00 - for usery0@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 2 - diff --git a/test/mail/2138.usery1 b/test/mail/2138.usery1 deleted file mode 100644 index e1b08c6ad..000000000 --- a/test/mail/2138.usery1 +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbF-0005vi-00 - for usery1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 2 - diff --git a/test/mail/2138.userz0 b/test/mail/2138.userz0 deleted file mode 100644 index 9f4558735..000000000 --- a/test/mail/2138.userz0 +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbC-0005vi-00 - for userz0@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 3 - diff --git a/test/mail/2138.userz1 b/test/mail/2138.userz1 deleted file mode 100644 index 17e3991b0..000000000 --- a/test/mail/2138.userz1 +++ /dev/null @@ -1,17 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmbD-0005vi-00 - for userz1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -Test message 3 - diff --git a/test/msglog/1157.10HmbM-0005vi-00 b/test/msglog/1157.10HmbM-0005vi-00 new file mode 100644 index 000000000..70e707538 --- /dev/null +++ b/test/msglog/1157.10HmbM-0005vi-00 @@ -0,0 +1 @@ +1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbJ-0005vi-00@myhost.test.ex diff --git a/test/msglog/1157.10HmbN-0005vi-00 b/test/msglog/1157.10HmbN-0005vi-00 new file mode 100644 index 000000000..dbe4dd959 --- /dev/null +++ b/test/msglog/1157.10HmbN-0005vi-00 @@ -0,0 +1 @@ +1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbL-0005vi-00@myhost.test.ex diff --git a/test/msglog/1157.10HmbO-0005vi-00 b/test/msglog/1157.10HmbO-0005vi-00 new file mode 100644 index 000000000..2a90570c8 --- /dev/null +++ b/test/msglog/1157.10HmbO-0005vi-00 @@ -0,0 +1 @@ +1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbK-0005vi-00@myhost.test.ex diff --git a/test/msglog/2013.10HmbM-0005vi-00 b/test/msglog/2013.10HmbM-0005vi-00 deleted file mode 100644 index 70e707538..000000000 --- a/test/msglog/2013.10HmbM-0005vi-00 +++ /dev/null @@ -1 +0,0 @@ -1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbJ-0005vi-00@myhost.test.ex diff --git a/test/msglog/2013.10HmbN-0005vi-00 b/test/msglog/2013.10HmbN-0005vi-00 deleted file mode 100644 index dbe4dd959..000000000 --- a/test/msglog/2013.10HmbN-0005vi-00 +++ /dev/null @@ -1 +0,0 @@ -1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbL-0005vi-00@myhost.test.ex diff --git a/test/msglog/2013.10HmbO-0005vi-00 b/test/msglog/2013.10HmbO-0005vi-00 deleted file mode 100644 index 2a90570c8..000000000 --- a/test/msglog/2013.10HmbO-0005vi-00 +++ /dev/null @@ -1 +0,0 @@ -1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbK-0005vi-00@myhost.test.ex diff --git a/test/msglog/2113.10HmbM-0005vi-00 b/test/msglog/2113.10HmbM-0005vi-00 deleted file mode 100644 index 70e707538..000000000 --- a/test/msglog/2113.10HmbM-0005vi-00 +++ /dev/null @@ -1 +0,0 @@ -1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbJ-0005vi-00@myhost.test.ex diff --git a/test/msglog/2113.10HmbN-0005vi-00 b/test/msglog/2113.10HmbN-0005vi-00 deleted file mode 100644 index dbe4dd959..000000000 --- a/test/msglog/2113.10HmbN-0005vi-00 +++ /dev/null @@ -1 +0,0 @@ -1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbL-0005vi-00@myhost.test.ex diff --git a/test/msglog/2113.10HmbO-0005vi-00 b/test/msglog/2113.10HmbO-0005vi-00 deleted file mode 100644 index 2a90570c8..000000000 --- a/test/msglog/2113.10HmbO-0005vi-00 +++ /dev/null @@ -1 +0,0 @@ -1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbK-0005vi-00@myhost.test.ex diff --git a/test/rejectlog/1153 b/test/rejectlog/1153 new file mode 100644 index 000000000..113f2865f --- /dev/null +++ b/test/rejectlog/1153 @@ -0,0 +1,3 @@ + +******** SERVER ******** +1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F= rejected RCPT : encryption required diff --git a/test/rejectlog/2009 b/test/rejectlog/2009 deleted file mode 100644 index 113f2865f..000000000 --- a/test/rejectlog/2009 +++ /dev/null @@ -1,3 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F= rejected RCPT : encryption required diff --git a/test/rejectlog/2109 b/test/rejectlog/2109 deleted file mode 100644 index 113f2865f..000000000 --- a/test/rejectlog/2109 +++ /dev/null @@ -1,3 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F= rejected RCPT : encryption required diff --git a/test/runtest b/test/runtest index 1e604e1cd..323472634 100755 --- a/test/runtest +++ b/test/runtest @@ -1489,6 +1489,8 @@ RESET_AFTER_EXTRA_LINE_READ: # Platform differences in errno strings s/Arg list too long/Argument list too long/; + + s/session: \((SSL_connect|gnutls_handshake)\): timed out/session: (tls lib connect fn): timed out/; } # ======== mail ======== diff --git a/test/scripts/1100-Basic-TLS/1103 b/test/scripts/1100-Basic-TLS/1103 deleted file mode 100644 index de97e32ef..000000000 --- a/test/scripts/1100-Basic-TLS/1103 +++ /dev/null @@ -1,21 +0,0 @@ -# TLS client: creds caching -# -# -mkdir -p DIR/tmp/certs -cp DIR/aux-fixed/cert1 DIR/tmp/certs/servercert -cp DIR/aux-fixed/cert1 DIR/tmp/certs/serverkey -# -# load up one message in the queue -exim test@example.com -**** -# -# start the daemon, with a queue-run interval -# this will send the queued message and the receive will re-queue it -#exim -d-all+tls+receive+timestamp -DSERVER=server -bd -q7s -oX PORT_D -exim -DSERVER=server -bd -q7s -oX PORT_D -**** -sleep 1 -killdaemon -# -sudo rm -fr DIR/tmp -no_msglog_check diff --git a/test/scripts/1100-Basic-TLS/1150 b/test/scripts/1100-Basic-TLS/1150 new file mode 100644 index 000000000..f22086a76 --- /dev/null +++ b/test/scripts/1100-Basic-TLS/1150 @@ -0,0 +1,15 @@ +# TLS client: general +gnutls +exim -DSERVER=server -bd -oX PORT_D +**** +exim CALLER@test.ex +Test message. Contains FF: ÿ +**** +exim CALLER@test.ex abcd@test.ex xyz@test.ex +Test message to two different hosts +**** +exim -v -qf +**** +killdaemon +exim -DSERVER=server -DNOTDAEMON -qf +**** diff --git a/test/scripts/1100-Basic-TLS/1151 b/test/scripts/1100-Basic-TLS/1151 new file mode 100644 index 000000000..de97e32ef --- /dev/null +++ b/test/scripts/1100-Basic-TLS/1151 @@ -0,0 +1,21 @@ +# TLS client: creds caching +# +# +mkdir -p DIR/tmp/certs +cp DIR/aux-fixed/cert1 DIR/tmp/certs/servercert +cp DIR/aux-fixed/cert1 DIR/tmp/certs/serverkey +# +# load up one message in the queue +exim test@example.com +**** +# +# start the daemon, with a queue-run interval +# this will send the queued message and the receive will re-queue it +#exim -d-all+tls+receive+timestamp -DSERVER=server -bd -q7s -oX PORT_D +exim -DSERVER=server -bd -q7s -oX PORT_D +**** +sleep 1 +killdaemon +# +sudo rm -fr DIR/tmp +no_msglog_check diff --git a/test/scripts/1100-Basic-TLS/1152 b/test/scripts/1100-Basic-TLS/1152 new file mode 100644 index 000000000..280c426d2 --- /dev/null +++ b/test/scripts/1100-Basic-TLS/1152 @@ -0,0 +1,11 @@ +# TLS client: log_smtp_confirmation +gnutls +exim -DSERVER=server -bd -oX PORT_D +**** +exim userx@test.ex +Test message +**** +exim -qf +**** +killdaemon +no_msglog_check diff --git a/test/scripts/1100-Basic-TLS/1153 b/test/scripts/1100-Basic-TLS/1153 new file mode 100644 index 000000000..69eb61d07 --- /dev/null +++ b/test/scripts/1100-Basic-TLS/1153 @@ -0,0 +1,11 @@ +# TLS client: hosts_avoid_tls +gnutls +exim -DSERVER=server -bd -oX PORT_D +**** +exim userx@test.ex +Test message +**** +exim -qf +**** +killdaemon +no_msglog_check diff --git a/test/scripts/1100-Basic-TLS/1157 b/test/scripts/1100-Basic-TLS/1157 new file mode 100644 index 000000000..afbc9a6b7 --- /dev/null +++ b/test/scripts/1100-Basic-TLS/1157 @@ -0,0 +1,52 @@ +# TLS client: multiple messages over one connection +gnutls +exim -DSERVER=server -bd -oX PORT_D +**** +exim userx@test.ex +Test message 1 +**** +exim usery@test.ex +Test message 2 +**** +exim userz@test.ex +Test message 3 +**** +exim -d-all+acl -qqf +**** +killdaemon +exim -DSERVER=server -DNOTDAEMON -qf +**** +# +exim -DSERVER=server -bd -oX PORT_D +**** +exim usera@test.ex +Test message 1 +**** +exim userb@test.ex +Test message 2 +**** +exim userc@test.ex +Test message 3 +**** +exim -DEQUIRE -d-all+acl -qqf +**** +killdaemon +exim -DSERVER=server -DNOTDAEMON -qf +**** +# +# +# no tls proxy (default for test was permitting proxy) +exim -DSERVER=server -bd -oX PORT_D +**** +exim userx@test.ex +Test message 1 +**** +exim usery@test.ex +Test message 2 +**** +exim userz@test.ex +Test message 3 +**** +exim -d-all+acl '-DPEX=*' -qqf +**** +killdaemon diff --git a/test/scripts/1100-Basic-TLS/1158 b/test/scripts/1100-Basic-TLS/1158 new file mode 100644 index 000000000..2da309d68 --- /dev/null +++ b/test/scripts/1100-Basic-TLS/1158 @@ -0,0 +1,16 @@ +# TLS client: timeout while setting up TLS +gnutls +server PORT_S +220 ESMTP +EHLO +250-OK +250-STARTTLS +250 HELP +STARTTLS +220 Go ahead +*sleep 2 +**** +exim -odi userx@domain1 +Test message +**** +no_msglog_check diff --git a/test/scripts/1100-Basic-TLS/1159 b/test/scripts/1100-Basic-TLS/1159 new file mode 100644 index 000000000..af08df0b1 --- /dev/null +++ b/test/scripts/1100-Basic-TLS/1159 @@ -0,0 +1,15 @@ +# TLS client: hosts_nopass_tls +gnutls +exim -DSERVER=server -bd -oX PORT_D +**** +exim userx@test.ex +Test message 1 +**** +exim userx@test.ex +Test message 2 +**** +exim -qqf +**** +killdaemon +exim -DSERVER=server -DNOTDAEMON -qf +**** diff --git a/test/scripts/1100-Basic-TLS/1161 b/test/scripts/1100-Basic-TLS/1161 new file mode 100644 index 000000000..5c402ce2c --- /dev/null +++ b/test/scripts/1100-Basic-TLS/1161 @@ -0,0 +1,53 @@ +# TLS client: 4xx response to STARTTLS +gnutls +server PORT_S +220 ESMTP +EHLO +250-OK +250-HELP +250-STARTTLS +250 PIPELINING +STARTTLS +450 temp problem +QUIT +250 OK +**** +exim -DTRYCLEAR=tls_tempfail_tryclear=false -odi x@y +**** +server PORT_S +220 ESMTP +EHLO +250-OK +250-HELP +250-STARTTLS +250 PIPELINING +STARTTLS +450 temp problem +MAIL FROM: +250 OK +RCPT TO: +250 OK +DATA +354 Go ahead +. +250 OK +QUIT +250 OK +**** +exim -qf +**** +server PORT_S +220 ESMTP +EHLO +250-OK +250-HELP +250-STARTTLS +250 PIPELINING +STARTTLS +450 temp problem +QUIT +250 OK +**** +exim -DREQUIRE=hosts_require_tls=* -odi x@y +**** +no_msglog_check diff --git a/test/scripts/1100-Basic-TLS/1163 b/test/scripts/1100-Basic-TLS/1163 new file mode 100644 index 000000000..650286814 --- /dev/null +++ b/test/scripts/1100-Basic-TLS/1163 @@ -0,0 +1,18 @@ +# TLS client: multiple messages over one connection (continue_more) +gnutls +exim -DSERVER=server -bd -oX PORT_D +**** +exim userx0@test.ex userx1@test.ex +Test message 1 +**** +exim usery0@test.ex usery1@test.ex +Test message 2 +**** +exim userz0@test.ex userz1@test.ex +Test message 3 +**** +exim -qqf +**** +killdaemon +exim -DSERVER=server -DNOTDAEMON -qf +**** diff --git a/test/scripts/1100-Basic-TLS/1164 b/test/scripts/1100-Basic-TLS/1164 new file mode 100644 index 000000000..19dfc6479 --- /dev/null +++ b/test/scripts/1100-Basic-TLS/1164 @@ -0,0 +1,34 @@ +# TLS client: recipient callout - TLS fail, retry in clear +need_ipv4 +# +server PORT_S 2 +220 Server ready +EHLO +250-wotcher mate +250-STARTTLS +250 OK +STARTTLS +250 +. +220 Server ready +EHLO +250-wotcher mate +250-STARTTLS +250 OK +MAIL FROM +250 OK +RCPT TO +250 OK +QUIT +250 OK +**** +exim -odq -bs +ehlo xxxx +mail from: s1@test.ex +rcpt to: r1@test.ex +data +. +quit +**** +no_stdout_check +no_msglog_check diff --git a/test/scripts/1100-Basic-TLS/1165 b/test/scripts/1100-Basic-TLS/1165 new file mode 100644 index 000000000..58e5163c5 --- /dev/null +++ b/test/scripts/1100-Basic-TLS/1165 @@ -0,0 +1,9 @@ +# TLS client, CHUNKING transmission +gnutls +exim -DSERVER=server -DSRV=tls -bd -oX PORT_S +**** +exim -oMt this-user -f this-user -odf other-user@test.ex +Test message. Contains FF: ÿ +**** +killdaemon +no_msglog_check diff --git a/test/scripts/2000-GnuTLS/2007 b/test/scripts/2000-GnuTLS/2007 deleted file mode 100644 index 280c426d2..000000000 --- a/test/scripts/2000-GnuTLS/2007 +++ /dev/null @@ -1,11 +0,0 @@ -# TLS client: log_smtp_confirmation -gnutls -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message -**** -exim -qf -**** -killdaemon -no_msglog_check diff --git a/test/scripts/2000-GnuTLS/2008 b/test/scripts/2000-GnuTLS/2008 deleted file mode 100644 index f22086a76..000000000 --- a/test/scripts/2000-GnuTLS/2008 +++ /dev/null @@ -1,15 +0,0 @@ -# TLS client: general -gnutls -exim -DSERVER=server -bd -oX PORT_D -**** -exim CALLER@test.ex -Test message. Contains FF: ÿ -**** -exim CALLER@test.ex abcd@test.ex xyz@test.ex -Test message to two different hosts -**** -exim -v -qf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** diff --git a/test/scripts/2000-GnuTLS/2009 b/test/scripts/2000-GnuTLS/2009 deleted file mode 100644 index 69eb61d07..000000000 --- a/test/scripts/2000-GnuTLS/2009 +++ /dev/null @@ -1,11 +0,0 @@ -# TLS client: hosts_avoid_tls -gnutls -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message -**** -exim -qf -**** -killdaemon -no_msglog_check diff --git a/test/scripts/2000-GnuTLS/2013 b/test/scripts/2000-GnuTLS/2013 deleted file mode 100644 index afbc9a6b7..000000000 --- a/test/scripts/2000-GnuTLS/2013 +++ /dev/null @@ -1,52 +0,0 @@ -# TLS client: multiple messages over one connection -gnutls -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message 1 -**** -exim usery@test.ex -Test message 2 -**** -exim userz@test.ex -Test message 3 -**** -exim -d-all+acl -qqf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** -# -exim -DSERVER=server -bd -oX PORT_D -**** -exim usera@test.ex -Test message 1 -**** -exim userb@test.ex -Test message 2 -**** -exim userc@test.ex -Test message 3 -**** -exim -DEQUIRE -d-all+acl -qqf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** -# -# -# no tls proxy (default for test was permitting proxy) -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message 1 -**** -exim usery@test.ex -Test message 2 -**** -exim userz@test.ex -Test message 3 -**** -exim -d-all+acl '-DPEX=*' -qqf -**** -killdaemon diff --git a/test/scripts/2000-GnuTLS/2016 b/test/scripts/2000-GnuTLS/2016 deleted file mode 100644 index 2da309d68..000000000 --- a/test/scripts/2000-GnuTLS/2016 +++ /dev/null @@ -1,16 +0,0 @@ -# TLS client: timeout while setting up TLS -gnutls -server PORT_S -220 ESMTP -EHLO -250-OK -250-STARTTLS -250 HELP -STARTTLS -220 Go ahead -*sleep 2 -**** -exim -odi userx@domain1 -Test message -**** -no_msglog_check diff --git a/test/scripts/2000-GnuTLS/2017 b/test/scripts/2000-GnuTLS/2017 deleted file mode 100644 index af08df0b1..000000000 --- a/test/scripts/2000-GnuTLS/2017 +++ /dev/null @@ -1,15 +0,0 @@ -# TLS client: hosts_nopass_tls -gnutls -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message 1 -**** -exim userx@test.ex -Test message 2 -**** -exim -qqf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** diff --git a/test/scripts/2000-GnuTLS/2021 b/test/scripts/2000-GnuTLS/2021 deleted file mode 100644 index 5c402ce2c..000000000 --- a/test/scripts/2000-GnuTLS/2021 +++ /dev/null @@ -1,53 +0,0 @@ -# TLS client: 4xx response to STARTTLS -gnutls -server PORT_S -220 ESMTP -EHLO -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -QUIT -250 OK -**** -exim -DTRYCLEAR=tls_tempfail_tryclear=false -odi x@y -**** -server PORT_S -220 ESMTP -EHLO -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -MAIL FROM: -250 OK -RCPT TO: -250 OK -DATA -354 Go ahead -. -250 OK -QUIT -250 OK -**** -exim -qf -**** -server PORT_S -220 ESMTP -EHLO -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -QUIT -250 OK -**** -exim -DREQUIRE=hosts_require_tls=* -odi x@y -**** -no_msglog_check diff --git a/test/scripts/2000-GnuTLS/2033 b/test/scripts/2000-GnuTLS/2033 index f43d18de4..1559a7748 100644 --- a/test/scripts/2000-GnuTLS/2033 +++ b/test/scripts/2000-GnuTLS/2033 @@ -2,12 +2,16 @@ gnutls exim -DSERVER=server -bd -oX PORT_D **** +# this will fail to verify the cert at HOSTIPV4 and fallback to unencrypted +exim userq@test.ex +Testing +**** # this will fail to verify the cert name and fallback to unencrypted exim userr@test.ex Testing **** # this will pass the cert verify including name check -exim users@test.ex +exim user_s@test.ex Testing **** # this will fail to verify the cert name but carry on (try-verify mode) diff --git a/test/scripts/2000-GnuTLS/2038 b/test/scripts/2000-GnuTLS/2038 deleted file mode 100644 index 650286814..000000000 --- a/test/scripts/2000-GnuTLS/2038 +++ /dev/null @@ -1,18 +0,0 @@ -# TLS client: multiple messages over one connection (continue_more) -gnutls -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx0@test.ex userx1@test.ex -Test message 1 -**** -exim usery0@test.ex usery1@test.ex -Test message 2 -**** -exim userz0@test.ex userz1@test.ex -Test message 3 -**** -exim -qqf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** diff --git a/test/scripts/2000-GnuTLS/2051 b/test/scripts/2000-GnuTLS/2051 deleted file mode 120000 index ac5066b61..000000000 --- a/test/scripts/2000-GnuTLS/2051 +++ /dev/null @@ -1 +0,0 @@ -../2100-OpenSSL/2151 \ No newline at end of file diff --git a/test/scripts/2000-GnuTLS/2091 b/test/scripts/2000-GnuTLS/2091 deleted file mode 100644 index 58e5163c5..000000000 --- a/test/scripts/2000-GnuTLS/2091 +++ /dev/null @@ -1,9 +0,0 @@ -# TLS client, CHUNKING transmission -gnutls -exim -DSERVER=server -DSRV=tls -bd -oX PORT_S -**** -exim -oMt this-user -f this-user -odf other-user@test.ex -Test message. Contains FF: ÿ -**** -killdaemon -no_msglog_check diff --git a/test/scripts/2100-OpenSSL/2107 b/test/scripts/2100-OpenSSL/2107 deleted file mode 100644 index 9317a5e86..000000000 --- a/test/scripts/2100-OpenSSL/2107 +++ /dev/null @@ -1,10 +0,0 @@ -# TLS client: log_smtp_confirmation -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message -**** -exim -qf -**** -killdaemon -no_msglog_check diff --git a/test/scripts/2100-OpenSSL/2108 b/test/scripts/2100-OpenSSL/2108 deleted file mode 100644 index 43ca6cff0..000000000 --- a/test/scripts/2100-OpenSSL/2108 +++ /dev/null @@ -1,14 +0,0 @@ -# TLS client: general -exim -DSERVER=server -bd -oX PORT_D -**** -exim CALLER@test.ex -Test message. Contains FF: ÿ -**** -exim CALLER@test.ex abcd@test.ex xyz@test.ex -Test message to two different hosts -**** -exim -v -qf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** diff --git a/test/scripts/2100-OpenSSL/2109 b/test/scripts/2100-OpenSSL/2109 deleted file mode 100644 index 85cb1300c..000000000 --- a/test/scripts/2100-OpenSSL/2109 +++ /dev/null @@ -1,10 +0,0 @@ -# TLS client: hosts_avoid_tls -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message -**** -exim -qf -**** -killdaemon -no_msglog_check diff --git a/test/scripts/2100-OpenSSL/2113 b/test/scripts/2100-OpenSSL/2113 deleted file mode 100644 index c1341e857..000000000 --- a/test/scripts/2100-OpenSSL/2113 +++ /dev/null @@ -1,51 +0,0 @@ -# TLS client: multiple messages over one connection -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message 1 -**** -exim usery@test.ex -Test message 2 -**** -exim userz@test.ex -Test message 3 -**** -exim -d-all+acl -qqf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** -# -exim -DSERVER=server -bd -oX PORT_D -**** -exim usera@test.ex -Test message 1 -**** -exim userb@test.ex -Test message 2 -**** -exim userc@test.ex -Test message 3 -**** -exim -DEQUIRE -d-all+acl -qqf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** -# -# -# no tls proxy (default for test was permitting proxy) -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message 1 -**** -exim usery@test.ex -Test message 2 -**** -exim userz@test.ex -Test message 3 -**** -exim -d-all+acl '-DPEX=*' -qqf -**** -killdaemon diff --git a/test/scripts/2100-OpenSSL/2116 b/test/scripts/2100-OpenSSL/2116 deleted file mode 100644 index a11125bfb..000000000 --- a/test/scripts/2100-OpenSSL/2116 +++ /dev/null @@ -1,15 +0,0 @@ -# TLS client: timeout while setting up TLS -server PORT_S -220 ESMTP -EHLO -250-OK -250-STARTTLS -250 HELP -STARTTLS -220 Go ahead -*sleep 2 -**** -exim -odi userx@domain1 -Test message -**** -no_msglog_check diff --git a/test/scripts/2100-OpenSSL/2117 b/test/scripts/2100-OpenSSL/2117 deleted file mode 100644 index 2d7bffff1..000000000 --- a/test/scripts/2100-OpenSSL/2117 +++ /dev/null @@ -1,14 +0,0 @@ -# TLS client: hosts_nopass_tls -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message 1 -**** -exim userx@test.ex -Test message 2 -**** -exim -qqf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** diff --git a/test/scripts/2100-OpenSSL/2121 b/test/scripts/2100-OpenSSL/2121 deleted file mode 100644 index 49ee4c14e..000000000 --- a/test/scripts/2100-OpenSSL/2121 +++ /dev/null @@ -1,52 +0,0 @@ -# TLS client: 4xx response to STARTTLS -server PORT_S -220 ESMTP -EHLO -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -QUIT -250 OK -**** -exim -DTRYCLEAR=tls_tempfail_tryclear=false -odi x@y -**** -server PORT_S -220 ESMTP -EHLO -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -MAIL FROM: -250 OK -RCPT TO: -250 OK -DATA -354 Go ahead -. -250 OK -QUIT -250 OK -**** -exim -qf -**** -server PORT_S -220 ESMTP -EHLO -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -QUIT -250 OK -**** -exim -DREQUIRE=hosts_require_tls=* -odi x@y -**** -no_msglog_check diff --git a/test/scripts/2100-OpenSSL/2138 b/test/scripts/2100-OpenSSL/2138 deleted file mode 100644 index 79eaa2f31..000000000 --- a/test/scripts/2100-OpenSSL/2138 +++ /dev/null @@ -1,17 +0,0 @@ -# TLS client: multiple messages over one connection (continue_more) -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx0@test.ex userx1@test.ex -Test message 1 -**** -exim usery0@test.ex usery1@test.ex -Test message 2 -**** -exim userz0@test.ex userz1@test.ex -Test message 3 -**** -exim -qqf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** diff --git a/test/scripts/2100-OpenSSL/2151 b/test/scripts/2100-OpenSSL/2151 deleted file mode 100644 index 19dfc6479..000000000 --- a/test/scripts/2100-OpenSSL/2151 +++ /dev/null @@ -1,34 +0,0 @@ -# TLS client: recipient callout - TLS fail, retry in clear -need_ipv4 -# -server PORT_S 2 -220 Server ready -EHLO -250-wotcher mate -250-STARTTLS -250 OK -STARTTLS -250 -. -220 Server ready -EHLO -250-wotcher mate -250-STARTTLS -250 OK -MAIL FROM -250 OK -RCPT TO -250 OK -QUIT -250 OK -**** -exim -odq -bs -ehlo xxxx -mail from: s1@test.ex -rcpt to: r1@test.ex -data -. -quit -**** -no_stdout_check -no_msglog_check diff --git a/test/scripts/2100-OpenSSL/2191 b/test/scripts/2100-OpenSSL/2191 deleted file mode 100644 index 86963f747..000000000 --- a/test/scripts/2100-OpenSSL/2191 +++ /dev/null @@ -1,8 +0,0 @@ -# TLS client, CHUNKING transmission -exim -DSERVER=server -DSRV=tls -bd -oX PORT_S -**** -exim -oMt this-user -f this-user -odf other-user@test.ex -Test message. Contains FF: ÿ -**** -killdaemon -no_msglog_check diff --git a/test/stderr/1150 b/test/stderr/1150 new file mode 100644 index 000000000..395644cb1 --- /dev/null +++ b/test/stderr/1150 @@ -0,0 +1,103 @@ +LOG: queue_run MAIN + Start queue run: pid=pppp -qf +delivering 10HmaX-0005vi-00 (queue run pid ppppp) +Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected + SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 + SMTP>> EHLO helo.data.changed + SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250-STARTTLS + 250 HELP + SMTP>> STARTTLS + SMTP<< 220 TLS go ahead + SMTP>> EHLO helo.data.changed + SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250 HELP + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: + SMTP>> DATA + SMTP<< 250 OK + SMTP<< 250 Accepted + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP>> writing message and terminating "." + SMTP<< 250 OK id=10HmaZ-0005vi-00 + SMTP>> QUIT + SMTP(close)>> +LOG: MAIN + => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" +LOG: MAIN + Completed +delivering 10HmaY-0005vi-00 (queue run pid ppppp) +Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected + SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 + SMTP>> EHLO helo.data.changed + SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250-STARTTLS + 250 HELP + SMTP>> STARTTLS + SMTP<< 220 TLS go ahead + SMTP>> EHLO helo.data.changed + SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250 HELP + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: + SMTP>> RCPT TO: + SMTP>> DATA + SMTP<< 250 OK + SMTP<< 250 Accepted + SMTP<< 250 Accepted + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP>> writing message and terminating "." + SMTP<< 250 OK id=10HmbA-0005vi-00 + SMTP>> QUIT + SMTP(close)>> +LOG: MAIN + => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" +LOG: MAIN + -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" +Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected + SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 + SMTP>> EHLO myhost.test.ex + SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250-STARTTLS + 250 HELP + SMTP>> STARTTLS + SMTP<< 220 TLS go ahead + SMTP>> EHLO myhost.test.ex + SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250 HELP + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: + SMTP>> DATA + SMTP<< 250 OK + SMTP<< 250 Accepted + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP>> writing message and terminating "." + SMTP<< 250 OK id=10HmbB-0005vi-00 + SMTP>> QUIT + SMTP(close)>> +LOG: MAIN + => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00" +LOG: MAIN + Completed +LOG: queue_run MAIN + End queue run: pid=pppp -qf + +******** SERVER ******** diff --git a/test/stderr/1157 b/test/stderr/1157 new file mode 100644 index 000000000..368ccc07d --- /dev/null +++ b/test/stderr/1157 @@ -0,0 +1,296 @@ +Exim version x.yz .... +configuration file is TESTSUITE/test-config +admin user +dropping to exim gid; retaining priv uid +LOG: queue_run MAIN + Start queue run: pid=pppp -qqf +>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected + SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 + SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes + SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250-STARTTLS + 250 HELP + SMTP>> STARTTLS +cmd buf flush ddd bytes + SMTP<< 220 TLS go ahead + SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes + SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250 HELP + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: + SMTP>> DATA +cmd buf flush ddd bytes + SMTP<< 250 OK + SMTP<< 250 Accepted + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP<< 250 OK id=10HmbA-0005vi-00 +LOG: MAIN + => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +trusted user +admin user +dropping to exim gid; retaining priv uid + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: + SMTP>> DATA +cmd buf flush ddd bytes + SMTP<< 250 OK + SMTP<< 250 Accepted + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP<< 250 OK id=10HmbB-0005vi-00 + SMTP(close)>> +LOG: MAIN + => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00" +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +trusted user +admin user +dropping to exim gid; retaining priv uid + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: + SMTP>> DATA +cmd buf flush ddd bytes + SMTP<< 250 OK + SMTP<< 250 Accepted + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP<< 250 OK id=10HmbC-0005vi-00 + SMTP>> QUIT +cmd buf flush ddd bytes + SMTP(close)>> +>>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> +LOG: MAIN + => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +LOG: queue_run MAIN + End queue run: pid=pppp -qqf +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +admin user +dropping to exim gid; retaining priv uid +LOG: queue_run MAIN + Start queue run: pid=pppp -qqf +>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected + SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 + SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes + SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250-STARTTLS + 250 HELP + SMTP>> STARTTLS +cmd buf flush ddd bytes + SMTP<< 220 TLS go ahead + SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes + SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250 HELP + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: + SMTP>> DATA +cmd buf flush ddd bytes + SMTP<< 250 OK + SMTP<< 250 Accepted + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP<< 250 OK id=10HmbG-0005vi-00 +LOG: MAIN + => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbG-0005vi-00" +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +trusted user +admin user +dropping to exim gid; retaining priv uid + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: + SMTP>> DATA +cmd buf flush ddd bytes + SMTP<< 250 OK + SMTP<< 250 Accepted + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP<< 250 OK id=10HmbH-0005vi-00 + SMTP(close)>> +LOG: MAIN + => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00" +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +trusted user +admin user +dropping to exim gid; retaining priv uid + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: + SMTP>> DATA +cmd buf flush ddd bytes + SMTP<< 250 OK + SMTP<< 250 Accepted + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP<< 250 OK id=10HmbI-0005vi-00 + SMTP>> QUIT +cmd buf flush ddd bytes + SMTP(close)>> +>>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> +LOG: MAIN + => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00" +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +LOG: queue_run MAIN + End queue run: pid=pppp -qqf +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +admin user +dropping to exim gid; retaining priv uid +LOG: queue_run MAIN + Start queue run: pid=pppp -qqf +>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected + SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 + SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes + SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250-STARTTLS + 250 HELP + SMTP>> STARTTLS +cmd buf flush ddd bytes + SMTP<< 220 TLS go ahead + SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes + SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250 HELP + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: + SMTP>> DATA +cmd buf flush ddd bytes + SMTP<< 250 OK + SMTP<< 250 Accepted + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP<< 250 OK id=10HmbM-0005vi-00 + SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes + SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250-STARTTLS + 250 HELP + SMTP(close)>> +LOG: MAIN + => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbM-0005vi-00" +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +trusted user +admin user +dropping to exim gid; retaining priv uid + SMTP>> STARTTLS +cmd buf flush ddd bytes + SMTP<< 220 TLS go ahead + SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes + SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250 HELP + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: + SMTP>> DATA +cmd buf flush ddd bytes + SMTP<< 250 OK + SMTP<< 250 Accepted + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP<< 250 OK id=10HmbN-0005vi-00 + SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes + SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250-STARTTLS + 250 HELP + SMTP(close)>> +LOG: MAIN + => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbN-0005vi-00" +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +trusted user +admin user +dropping to exim gid; retaining priv uid + SMTP>> STARTTLS +cmd buf flush ddd bytes + SMTP<< 220 TLS go ahead + SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes + SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] + 250-SIZE 52428800 + 250-8BITMIME + 250-PIPELINING + 250 HELP + SMTP>> MAIL FROM: SIZE=ssss + SMTP>> RCPT TO: + SMTP>> DATA +cmd buf flush ddd bytes + SMTP<< 250 OK + SMTP<< 250 Accepted + SMTP<< 354 Enter message, ending with "." on a line by itself + SMTP<< 250 OK id=10HmbO-0005vi-00 + SMTP>> QUIT +cmd buf flush ddd bytes + SMTP(close)>> +LOG: MAIN + => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbO-0005vi-00" +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> +LOG: queue_run MAIN + End queue run: pid=pppp -qqf +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + +******** SERVER ******** diff --git a/test/stderr/2008 b/test/stderr/2008 deleted file mode 100644 index 9f716c305..000000000 --- a/test/stderr/2008 +++ /dev/null @@ -1,103 +0,0 @@ -LOG: queue_run MAIN - Start queue run: pid=pppp -qf -delivering 10HmaX-0005vi-00 (queue run pid ppppp) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected - SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 - SMTP>> EHLO helo.data.changed - SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP>> STARTTLS - SMTP<< 220 TLS go ahead - SMTP>> EHLO helo.data.changed - SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." - SMTP<< 250 OK id=10HmaZ-0005vi-00 - SMTP>> QUIT - SMTP(close)>> -LOG: MAIN - => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00" -LOG: MAIN - Completed -delivering 10HmaY-0005vi-00 (queue run pid ppppp) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected - SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 - SMTP>> EHLO helo.data.changed - SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP>> STARTTLS - SMTP<< 220 TLS go ahead - SMTP>> EHLO helo.data.changed - SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> DATA - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." - SMTP<< 250 OK id=10HmbA-0005vi-00 - SMTP>> QUIT - SMTP(close)>> -LOG: MAIN - => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -LOG: MAIN - -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected - SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 - SMTP>> EHLO myhost.test.ex - SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP>> STARTTLS - SMTP<< 220 TLS go ahead - SMTP>> EHLO myhost.test.ex - SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." - SMTP<< 250 OK id=10HmbB-0005vi-00 - SMTP>> QUIT - SMTP(close)>> -LOG: MAIN - => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00" -LOG: MAIN - Completed -LOG: queue_run MAIN - End queue run: pid=pppp -qf - -******** SERVER ******** diff --git a/test/stderr/2013 b/test/stderr/2013 deleted file mode 100644 index f3c5421e3..000000000 --- a/test/stderr/2013 +++ /dev/null @@ -1,296 +0,0 @@ -Exim version x.yz .... -configuration file is TESTSUITE/test-config -admin user -dropping to exim gid; retaining priv uid -LOG: queue_run MAIN - Start queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected - SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP>> STARTTLS -cmd buf flush ddd bytes - SMTP<< 220 TLS go ahead - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbA-0005vi-00 -LOG: MAIN - => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbB-0005vi-00 - SMTP(close)>> -LOG: MAIN - => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbC-0005vi-00 - SMTP>> QUIT -cmd buf flush ddd bytes - SMTP(close)>> ->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> -LOG: MAIN - => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> -LOG: queue_run MAIN - End queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -admin user -dropping to exim gid; retaining priv uid -LOG: queue_run MAIN - Start queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected - SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP>> STARTTLS -cmd buf flush ddd bytes - SMTP<< 220 TLS go ahead - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbG-0005vi-00 -LOG: MAIN - => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbH-0005vi-00 - SMTP(close)>> -LOG: MAIN - => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbI-0005vi-00 - SMTP>> QUIT -cmd buf flush ddd bytes - SMTP(close)>> ->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> -LOG: MAIN - => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> -LOG: queue_run MAIN - End queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -admin user -dropping to exim gid; retaining priv uid -LOG: queue_run MAIN - Start queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected - SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP>> STARTTLS -cmd buf flush ddd bytes - SMTP<< 220 TLS go ahead - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbM-0005vi-00 - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP(close)>> -LOG: MAIN - => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -dropping to exim gid; retaining priv uid - SMTP>> STARTTLS -cmd buf flush ddd bytes - SMTP<< 220 TLS go ahead - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbN-0005vi-00 - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP(close)>> -LOG: MAIN - => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -dropping to exim gid; retaining priv uid - SMTP>> STARTTLS -cmd buf flush ddd bytes - SMTP<< 220 TLS go ahead - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbO-0005vi-00 - SMTP>> QUIT -cmd buf flush ddd bytes - SMTP(close)>> -LOG: MAIN - => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbO-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> -LOG: queue_run MAIN - End queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> - -******** SERVER ******** diff --git a/test/stderr/2108 b/test/stderr/2108 deleted file mode 100644 index 47f057830..000000000 --- a/test/stderr/2108 +++ /dev/null @@ -1,115 +0,0 @@ -LOG: queue_run MAIN - Start queue run: pid=pppp -qf -delivering 10HmaX-0005vi-00 (queue run pid ppppp) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected - SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 - SMTP>> EHLO helo.data.changed - SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP>> STARTTLS - SMTP<< 220 TLS go ahead -LOG: MAIN - [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock -LOG: MAIN - [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1" - SMTP>> EHLO helo.data.changed - SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." - SMTP<< 250 OK id=10HmaZ-0005vi-00 - SMTP>> QUIT - SMTP(close)>> -LOG: MAIN - => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00" -LOG: MAIN - Completed -delivering 10HmaY-0005vi-00 (queue run pid ppppp) -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected - SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 - SMTP>> EHLO helo.data.changed - SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP>> STARTTLS - SMTP<< 220 TLS go ahead -LOG: MAIN - [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock -LOG: MAIN - [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1" - SMTP>> EHLO helo.data.changed - SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> DATA - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." - SMTP<< 250 OK id=10HmbA-0005vi-00 - SMTP>> QUIT - SMTP(close)>> -LOG: MAIN - => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -LOG: MAIN - -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected - SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 - SMTP>> EHLO myhost.test.ex - SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP>> STARTTLS - SMTP<< 220 TLS go ahead -LOG: MAIN - [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock -LOG: MAIN - [ip4.ip4.ip4.ip4] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="ip4.ip4.ip4.ip4" - SMTP>> EHLO myhost.test.ex - SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP>> writing message and terminating "." - SMTP<< 250 OK id=10HmbB-0005vi-00 - SMTP>> QUIT - SMTP(close)>> -LOG: MAIN - => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00" -LOG: MAIN - Completed -LOG: queue_run MAIN - End queue run: pid=pppp -qf - -******** SERVER ******** diff --git a/test/stderr/2113 b/test/stderr/2113 deleted file mode 100644 index dd24fbc51..000000000 --- a/test/stderr/2113 +++ /dev/null @@ -1,296 +0,0 @@ -Exim version x.yz .... -configuration file is TESTSUITE/test-config -admin user -dropping to exim gid; retaining priv uid -LOG: queue_run MAIN - Start queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected - SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP>> STARTTLS -cmd buf flush ddd bytes - SMTP<< 220 TLS go ahead - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbA-0005vi-00 -LOG: MAIN - => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbB-0005vi-00 - SMTP(close)>> -LOG: MAIN - => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbC-0005vi-00 - SMTP>> QUIT -cmd buf flush ddd bytes - SMTP(close)>> ->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> -LOG: MAIN - => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> -LOG: queue_run MAIN - End queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -admin user -dropping to exim gid; retaining priv uid -LOG: queue_run MAIN - Start queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected - SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP>> STARTTLS -cmd buf flush ddd bytes - SMTP<< 220 TLS go ahead - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbG-0005vi-00 -LOG: MAIN - => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbH-0005vi-00 - SMTP(close)>> -LOG: MAIN - => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbI-0005vi-00 - SMTP>> QUIT -cmd buf flush ddd bytes - SMTP(close)>> ->>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> -LOG: MAIN - => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> -LOG: queue_run MAIN - End queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -admin user -dropping to exim gid; retaining priv uid -LOG: queue_run MAIN - Start queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected - SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP>> STARTTLS -cmd buf flush ddd bytes - SMTP<< 220 TLS go ahead - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbM-0005vi-00 - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP(close)>> -LOG: MAIN - => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -dropping to exim gid; retaining priv uid - SMTP>> STARTTLS -cmd buf flush ddd bytes - SMTP<< 220 TLS go ahead - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbN-0005vi-00 - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250-STARTTLS - 250 HELP - SMTP(close)>> -LOG: MAIN - => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -dropping to exim gid; retaining priv uid - SMTP>> STARTTLS -cmd buf flush ddd bytes - SMTP<< 220 TLS go ahead - SMTP>> EHLO myhost.test.ex -cmd buf flush ddd bytes - SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] - 250-SIZE 52428800 - 250-8BITMIME - 250-PIPELINING - 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> DATA -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself - SMTP<< 250 OK id=10HmbO-0005vi-00 - SMTP>> QUIT -cmd buf flush ddd bytes - SMTP(close)>> -LOG: MAIN - => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbO-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> -LOG: queue_run MAIN - End queue run: pid=pppp -qqf ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> - -******** SERVER ******** diff --git a/test/stdout/1158 b/test/stdout/1158 new file mode 100644 index 000000000..4fc9cc430 --- /dev/null +++ b/test/stdout/1158 @@ -0,0 +1,13 @@ + +******** SERVER ******** +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 ESMTP +EHLO the.local.host.name +250-OK +250-STARTTLS +250 HELP +STARTTLS +220 Go ahead +*sleep 2 +End of script diff --git a/test/stdout/1161 b/test/stdout/1161 new file mode 100644 index 000000000..fad916638 --- /dev/null +++ b/test/stdout/1161 @@ -0,0 +1,57 @@ + +******** SERVER ******** +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 ESMTP +EHLO myhost.test.ex +250-OK +250-HELP +250-STARTTLS +250 PIPELINING +STARTTLS +450 temp problem +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 ESMTP +EHLO myhost.test.ex +250-OK +250-HELP +250-STARTTLS +250 PIPELINING +STARTTLS +450 temp problem +MAIL FROM: +250 OK +RCPT TO: +250 OK +DATA +354 Go ahead +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for x@y; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 OK +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 ESMTP +EHLO myhost.test.ex +250-OK +250-HELP +250-STARTTLS +250 PIPELINING +STARTTLS +450 temp problem +QUIT +250 OK +End of script diff --git a/test/stdout/2016 b/test/stdout/2016 deleted file mode 100644 index 4fc9cc430..000000000 --- a/test/stdout/2016 +++ /dev/null @@ -1,13 +0,0 @@ - -******** SERVER ******** -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 ESMTP -EHLO the.local.host.name -250-OK -250-STARTTLS -250 HELP -STARTTLS -220 Go ahead -*sleep 2 -End of script diff --git a/test/stdout/2021 b/test/stdout/2021 deleted file mode 100644 index fad916638..000000000 --- a/test/stdout/2021 +++ /dev/null @@ -1,57 +0,0 @@ - -******** SERVER ******** -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 ESMTP -EHLO myhost.test.ex -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -QUIT -250 OK -End of script -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 ESMTP -EHLO myhost.test.ex -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -MAIL FROM: -250 OK -RCPT TO: -250 OK -DATA -354 Go ahead -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -. -250 OK -QUIT -250 OK -End of script -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 ESMTP -EHLO myhost.test.ex -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -QUIT -250 OK -End of script diff --git a/test/stdout/2116 b/test/stdout/2116 deleted file mode 100644 index 4fc9cc430..000000000 --- a/test/stdout/2116 +++ /dev/null @@ -1,13 +0,0 @@ - -******** SERVER ******** -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 ESMTP -EHLO the.local.host.name -250-OK -250-STARTTLS -250 HELP -STARTTLS -220 Go ahead -*sleep 2 -End of script diff --git a/test/stdout/2121 b/test/stdout/2121 deleted file mode 100644 index fad916638..000000000 --- a/test/stdout/2121 +++ /dev/null @@ -1,57 +0,0 @@ - -******** SERVER ******** -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 ESMTP -EHLO myhost.test.ex -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -QUIT -250 OK -End of script -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 ESMTP -EHLO myhost.test.ex -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -MAIL FROM: -250 OK -RCPT TO: -250 OK -DATA -354 Go ahead -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -. -250 OK -QUIT -250 OK -End of script -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 ESMTP -EHLO myhost.test.ex -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -QUIT -250 OK -End of script -- cgit v1.2.3