From 5078e5337323159ff8c293e7ae335a974fd0371e Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 10 Aug 2021 15:24:48 +0100 Subject: Testsuite: testcase shuffling --- test/aux-fixed/4515.mlistfooter | 4 ++ test/aux-fixed/4525.mlistfooter | 4 -- test/confs/4510 | 85 ++++++++++++++++++++++++++++++ test/confs/4511 | 1 + test/confs/4512 | 1 + test/confs/4513 | 1 + test/confs/4514 | 1 + test/confs/4515 | 111 ++++++++++++++++++++++++++++++++++++++++ test/confs/4519 | 1 + test/confs/4520 | 85 ------------------------------ test/confs/4521 | 1 - test/confs/4522 | 1 - test/confs/4523 | 1 - test/confs/4524 | 1 - test/confs/4525 | 111 ---------------------------------------- test/confs/4530 | 1 - test/confs/4541 | 2 +- test/confs/4545 | 2 +- test/log/4510 | 102 ++++++++++++++++++++++++++++++++++++ test/log/4511 | 13 +++++ test/log/4512 | 7 +++ test/log/4513 | 13 +++++ test/log/4514 | 15 ++++++ test/log/4515 | 48 +++++++++++++++++ test/log/4519 | 21 ++++++++ test/log/4520 | 102 ------------------------------------ test/log/4521 | 13 ----- test/log/4522 | 7 --- test/log/4523 | 13 ----- test/log/4524 | 15 ------ test/log/4525 | 48 ----------------- test/log/4530 | 21 -------- test/mail/4510.a | 25 +++++++++ test/mail/4510.b | 22 ++++++++ test/mail/4510.b10 | 24 +++++++++ test/mail/4510.b12 | 26 ++++++++++ test/mail/4510.b20 | 24 +++++++++ test/mail/4510.b22 | 26 ++++++++++ test/mail/4510.d | 24 +++++++++ test/mail/4510.e | 19 +++++++ test/mail/4510.f | 24 +++++++++ test/mail/4513.a | 24 +++++++++ test/mail/4514.c | 28 ++++++++++ test/mail/4515.a | 24 +++++++++ test/mail/4515.b | 56 ++++++++++++++++++++ test/mail/4515.c | 56 ++++++++++++++++++++ test/mail/4519.y | 28 ++++++++++ test/mail/4519.z | 28 ++++++++++ test/mail/4520.a | 25 --------- test/mail/4520.b | 22 -------- test/mail/4520.b10 | 24 --------- test/mail/4520.b12 | 26 ---------- test/mail/4520.b20 | 24 --------- test/mail/4520.b22 | 26 ---------- test/mail/4520.d | 24 --------- test/mail/4520.e | 19 ------- test/mail/4520.f | 24 --------- test/mail/4523.a | 24 --------- test/mail/4524.c | 28 ---------- test/mail/4525.a | 24 --------- test/mail/4525.b | 56 -------------------- test/mail/4525.c | 56 -------------------- test/mail/4530.y | 28 ---------- test/mail/4530.z | 28 ---------- test/paniclog/4510 | 1 + test/paniclog/4520 | 1 - test/scripts/4500-DKIM/4510 | 92 +++++++++++++++++++++++++++++++++ test/scripts/4500-DKIM/4511 | 111 ++++++++++++++++++++++++++++++++++++++++ test/scripts/4500-DKIM/4512 | 85 ++++++++++++++++++++++++++++++ test/scripts/4500-DKIM/4513 | 15 ++++++ test/scripts/4500-DKIM/4514 | 14 +++++ test/scripts/4500-DKIM/4515 | 54 +++++++++++++++++++ test/scripts/4500-DKIM/4519 | 68 ++++++++++++++++++++++++ test/scripts/4500-DKIM/4520 | 92 --------------------------------- test/scripts/4500-DKIM/4521 | 111 ---------------------------------------- test/scripts/4500-DKIM/4522 | 85 ------------------------------ test/scripts/4500-DKIM/4523 | 15 ------ test/scripts/4500-DKIM/4524 | 14 ----- test/scripts/4500-DKIM/4525 | 54 ------------------- test/scripts/4500-DKIM/4530 | 68 ------------------------ test/stderr/4510 | 64 +++++++++++++++++++++++ test/stderr/4511 | 2 + test/stderr/4512 | 6 +++ test/stderr/4520 | 64 ----------------------- test/stderr/4521 | 2 - test/stderr/4522 | 6 --- test/stdout/4512 | 97 +++++++++++++++++++++++++++++++++++ test/stdout/4519 | 75 +++++++++++++++++++++++++++ 88 files changed, 1568 insertions(+), 1396 deletions(-) create mode 100644 test/aux-fixed/4515.mlistfooter delete mode 100644 test/aux-fixed/4525.mlistfooter create mode 100644 test/confs/4510 create mode 120000 test/confs/4511 create mode 120000 test/confs/4512 create mode 120000 test/confs/4513 create mode 120000 test/confs/4514 create mode 100644 test/confs/4515 create mode 120000 test/confs/4519 delete mode 100644 test/confs/4520 delete mode 120000 test/confs/4521 delete mode 120000 test/confs/4522 delete mode 120000 test/confs/4523 delete mode 120000 test/confs/4524 delete mode 100644 test/confs/4525 delete mode 120000 test/confs/4530 create mode 100644 test/log/4510 create mode 100644 test/log/4511 create mode 100644 test/log/4512 create mode 100644 test/log/4513 create mode 100644 test/log/4514 create mode 100644 test/log/4515 create mode 100644 test/log/4519 delete mode 100644 test/log/4520 delete mode 100644 test/log/4521 delete mode 100644 test/log/4522 delete mode 100644 test/log/4523 delete mode 100644 test/log/4524 delete mode 100644 test/log/4525 delete mode 100644 test/log/4530 create mode 100644 test/mail/4510.a create mode 100644 test/mail/4510.b create mode 100644 test/mail/4510.b10 create mode 100644 test/mail/4510.b12 create mode 100644 test/mail/4510.b20 create mode 100644 test/mail/4510.b22 create mode 100644 test/mail/4510.d create mode 100644 test/mail/4510.e create mode 100644 test/mail/4510.f create mode 100644 test/mail/4513.a create mode 100644 test/mail/4514.c create mode 100644 test/mail/4515.a create mode 100644 test/mail/4515.b create mode 100644 test/mail/4515.c create mode 100644 test/mail/4519.y create mode 100644 test/mail/4519.z delete mode 100644 test/mail/4520.a delete mode 100644 test/mail/4520.b delete mode 100644 test/mail/4520.b10 delete mode 100644 test/mail/4520.b12 delete mode 100644 test/mail/4520.b20 delete mode 100644 test/mail/4520.b22 delete mode 100644 test/mail/4520.d delete mode 100644 test/mail/4520.e delete mode 100644 test/mail/4520.f delete mode 100644 test/mail/4523.a delete mode 100644 test/mail/4524.c delete mode 100644 test/mail/4525.a delete mode 100644 test/mail/4525.b delete mode 100644 test/mail/4525.c delete mode 100644 test/mail/4530.y delete mode 100644 test/mail/4530.z create mode 100644 test/paniclog/4510 delete mode 100644 test/paniclog/4520 create mode 100644 test/scripts/4500-DKIM/4510 create mode 100644 test/scripts/4500-DKIM/4511 create mode 100644 test/scripts/4500-DKIM/4512 create mode 100644 test/scripts/4500-DKIM/4513 create mode 100644 test/scripts/4500-DKIM/4514 create mode 100644 test/scripts/4500-DKIM/4515 create mode 100644 test/scripts/4500-DKIM/4519 delete mode 100644 test/scripts/4500-DKIM/4520 delete mode 100644 test/scripts/4500-DKIM/4521 delete mode 100644 test/scripts/4500-DKIM/4522 delete mode 100644 test/scripts/4500-DKIM/4523 delete mode 100644 test/scripts/4500-DKIM/4524 delete mode 100644 test/scripts/4500-DKIM/4525 delete mode 100644 test/scripts/4500-DKIM/4530 create mode 100644 test/stderr/4510 create mode 100644 test/stderr/4511 create mode 100644 test/stderr/4512 delete mode 100644 test/stderr/4520 delete mode 100644 test/stderr/4521 delete mode 100644 test/stderr/4522 create mode 100644 test/stdout/4512 create mode 100644 test/stdout/4519 diff --git a/test/aux-fixed/4515.mlistfooter b/test/aux-fixed/4515.mlistfooter new file mode 100644 index 000000000..7c33b8233 --- /dev/null +++ b/test/aux-fixed/4515.mlistfooter @@ -0,0 +1,4 @@ + +-- +This is a generic mailinglist footer, using a traditional .sig-separator line +---- diff --git a/test/aux-fixed/4525.mlistfooter b/test/aux-fixed/4525.mlistfooter deleted file mode 100644 index 7c33b8233..000000000 --- a/test/aux-fixed/4525.mlistfooter +++ /dev/null @@ -1,4 +0,0 @@ - --- -This is a generic mailinglist footer, using a traditional .sig-separator line ----- diff --git a/test/confs/4510 b/test/confs/4510 new file mode 100644 index 000000000..f36b4df3d --- /dev/null +++ b/test/confs/4510 @@ -0,0 +1,85 @@ +# Exim test configuration 4510 + +SERVER= +OPT= +FAKE = + +.include DIR/aux-var/std_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +acl_smtp_rcpt = accept logwrite = rcpt_acl: macro: _DKIM_SIGN_HEADERS +acl_smtp_dkim = accept logwrite = dkim_acl: signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames +acl_smtp_data = accept logwrite = data_acl: dkim status $dkim_verify_status + +dkim_verify_signers = $dkim_signers +dkim_verify_min_keysizes = rsa=512 ed25519=250 +.ifdef FILTER +dkim_verify_minimal = true +.endif + +DDIR=DIR/aux-fixed/dkim + +log_selector = -dkim +dkim_verbose +received_recipients + +# ----- Routers + +begin routers + +server_store: + driver = accept + condition = ${if eq {SERVER}{server}{yes}{no}} + transport = file + +client: + driver = accept + transport = send_to_server + +# ----- Transports + +begin transports + +send_to_server: + driver = smtp + allow_localhost + hosts = HOSTIPV4 + port = PORT_D + hosts_try_fastopen = : + + dkim_domain = test.ex +.ifdef SELECTOR + dkim_selector = SELECTOR +.else + dkim_selector = sel +.endif + + dkim_private_key = ${extract {${length_3:$dkim_selector}} {\ + ses=dkim512.private \ + sel=dkim.private \ + sed=dkim_ed25519.private \ + }{DDIR/$value}} + +.ifndef HEADERS_MAXSIZE + dkim_sign_headers = OPT +.else + dkim_identity = allheaders@$dkim_domain +.endif +.ifdef VALUE + dkim_hash = VALUE +.endif +.ifdef STRICT + dkim_strict = STRICT +.endif +.ifdef TIMES + dkim_timestamps = TIMES +.endif + +file: + driver = appendfile + file = DIR/test-mail/$local_part + create_file = DIR/test-mail + user = CALLER + +# End diff --git a/test/confs/4511 b/test/confs/4511 new file mode 120000 index 000000000..1bb987150 --- /dev/null +++ b/test/confs/4511 @@ -0,0 +1 @@ +0900 \ No newline at end of file diff --git a/test/confs/4512 b/test/confs/4512 new file mode 120000 index 000000000..1bb987150 --- /dev/null +++ b/test/confs/4512 @@ -0,0 +1 @@ +0900 \ No newline at end of file diff --git a/test/confs/4513 b/test/confs/4513 new file mode 120000 index 000000000..a06e235b0 --- /dev/null +++ b/test/confs/4513 @@ -0,0 +1 @@ +4510 \ No newline at end of file diff --git a/test/confs/4514 b/test/confs/4514 new file mode 120000 index 000000000..a06e235b0 --- /dev/null +++ b/test/confs/4514 @@ -0,0 +1 @@ +4510 \ No newline at end of file diff --git a/test/confs/4515 b/test/confs/4515 new file mode 100644 index 000000000..db5048aac --- /dev/null +++ b/test/confs/4515 @@ -0,0 +1,111 @@ +# Exim test configuration 4515 + +SERVER= +OPT= +FAKE = + +keep_environment = PATH +exim_path = EXIM_PATH +host_lookup_order = bydns +spool_directory = DIR/spool + +.ifdef SERVER +log_file_path = DIR/spool/log/SERVER%slog +.else +log_file_path = DIR/spool/log/%slog +.endif + +gecos_pattern = "" +gecos_name = CALLER_NAME +dns_cname_loops = 9 +chunking_advertise_hosts = * + +.ifdef _HAVE_PIPE_CONNECT +pipelining_connect_advertise_hosts = : +.endif +.ifdef _HAVE_DMARC +dmarc_tld_file = +.endif +tls_advertise_hosts = + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +acl_smtp_rcpt = accept logwrite = rcpt acl: macro: _DKIM_SIGN_HEADERS +acl_smtp_dkim = accept logwrite = dkim_acl: signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames +acl_smtp_data = accept logwrite = data acl: dkim status $dkim_verify_status + +dkim_verify_signers = $dkim_signers + +DDIR=DIR/aux-fixed/dkim + +log_selector = +received_recipients + + +# ----- Routers + +begin routers + +server_store: + driver = accept + condition = ${if eq {SERVER}{server}{yes}{no}} + transport = file + +client: + driver = accept + transport = send_to_server + +# ----- Transports + +begin transports + +send_to_server: + driver = smtp + allow_localhost + hosts = HOSTIPV4 + port = PORT_D + hosts_try_fastopen = : + +.ifdef FILTER + transport_filter = /bin/cat - DIR/aux-fixed/TESTNUM.mlistfooter +.endif +.ifndef ALLOW + hosts_try_chunking = : +.endif + + dkim_domain = test.ex +.ifdef SELECTOR + dkim_selector = SELECTOR +.else + dkim_selector = sel +.endif + + dkim_private_key = ${extract {${length_3:$dkim_selector}} {\ + ses=dkim512.private \ + sel=dkim.private \ + sed=dkim_ed25519.private \ + }{DDIR/$value}} + +.ifndef HEADERS_MAXSIZE + dkim_sign_headers = OPT +.else + dkim_identity = allheaders@$dkim_domain +.endif +.ifdef VALUE + dkim_hash = VALUE +.endif +.ifdef STRICT + dkim_strict = STRICT +.endif +.ifdef TIMES + dkim_timestamps = TIMES +.endif + +file: + driver = appendfile + file = DIR/test-mail/$local_part + create_file = DIR/test-mail + user = CALLER + +# End diff --git a/test/confs/4519 b/test/confs/4519 new file mode 120000 index 000000000..a8ce02c97 --- /dev/null +++ b/test/confs/4519 @@ -0,0 +1 @@ +0906 \ No newline at end of file diff --git a/test/confs/4520 b/test/confs/4520 deleted file mode 100644 index 1ebd0817e..000000000 --- a/test/confs/4520 +++ /dev/null @@ -1,85 +0,0 @@ -# Exim test configuration 4520 - -SERVER= -OPT= -FAKE = - -.include DIR/aux-var/std_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = accept logwrite = rcpt_acl: macro: _DKIM_SIGN_HEADERS -acl_smtp_dkim = accept logwrite = dkim_acl: signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames -acl_smtp_data = accept logwrite = data_acl: dkim status $dkim_verify_status - -dkim_verify_signers = $dkim_signers -dkim_verify_min_keysizes = rsa=512 ed25519=250 -.ifdef FILTER -dkim_verify_minimal = true -.endif - -DDIR=DIR/aux-fixed/dkim - -log_selector = -dkim +dkim_verbose +received_recipients - -# ----- Routers - -begin routers - -server_store: - driver = accept - condition = ${if eq {SERVER}{server}{yes}{no}} - transport = file - -client: - driver = accept - transport = send_to_server - -# ----- Transports - -begin transports - -send_to_server: - driver = smtp - allow_localhost - hosts = HOSTIPV4 - port = PORT_D - hosts_try_fastopen = : - - dkim_domain = test.ex -.ifdef SELECTOR - dkim_selector = SELECTOR -.else - dkim_selector = sel -.endif - - dkim_private_key = ${extract {${length_3:$dkim_selector}} {\ - ses=dkim512.private \ - sel=dkim.private \ - sed=dkim_ed25519.private \ - }{DDIR/$value}} - -.ifndef HEADERS_MAXSIZE - dkim_sign_headers = OPT -.else - dkim_identity = allheaders@$dkim_domain -.endif -.ifdef VALUE - dkim_hash = VALUE -.endif -.ifdef STRICT - dkim_strict = STRICT -.endif -.ifdef TIMES - dkim_timestamps = TIMES -.endif - -file: - driver = appendfile - file = DIR/test-mail/$local_part - create_file = DIR/test-mail - user = CALLER - -# End diff --git a/test/confs/4521 b/test/confs/4521 deleted file mode 120000 index 1bb987150..000000000 --- a/test/confs/4521 +++ /dev/null @@ -1 +0,0 @@ -0900 \ No newline at end of file diff --git a/test/confs/4522 b/test/confs/4522 deleted file mode 120000 index 1bb987150..000000000 --- a/test/confs/4522 +++ /dev/null @@ -1 +0,0 @@ -0900 \ No newline at end of file diff --git a/test/confs/4523 b/test/confs/4523 deleted file mode 120000 index 072f5faf2..000000000 --- a/test/confs/4523 +++ /dev/null @@ -1 +0,0 @@ -4520 \ No newline at end of file diff --git a/test/confs/4524 b/test/confs/4524 deleted file mode 120000 index 072f5faf2..000000000 --- a/test/confs/4524 +++ /dev/null @@ -1 +0,0 @@ -4520 \ No newline at end of file diff --git a/test/confs/4525 b/test/confs/4525 deleted file mode 100644 index e254a7b35..000000000 --- a/test/confs/4525 +++ /dev/null @@ -1,111 +0,0 @@ -# Exim test configuration 4525 - -SERVER= -OPT= -FAKE = - -keep_environment = PATH -exim_path = EXIM_PATH -host_lookup_order = bydns -spool_directory = DIR/spool - -.ifdef SERVER -log_file_path = DIR/spool/log/SERVER%slog -.else -log_file_path = DIR/spool/log/%slog -.endif - -gecos_pattern = "" -gecos_name = CALLER_NAME -dns_cname_loops = 9 -chunking_advertise_hosts = * - -.ifdef _HAVE_PIPE_CONNECT -pipelining_connect_advertise_hosts = : -.endif -.ifdef _HAVE_DMARC -dmarc_tld_file = -.endif -tls_advertise_hosts = - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = accept logwrite = rcpt acl: macro: _DKIM_SIGN_HEADERS -acl_smtp_dkim = accept logwrite = dkim_acl: signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames -acl_smtp_data = accept logwrite = data acl: dkim status $dkim_verify_status - -dkim_verify_signers = $dkim_signers - -DDIR=DIR/aux-fixed/dkim - -log_selector = +received_recipients - - -# ----- Routers - -begin routers - -server_store: - driver = accept - condition = ${if eq {SERVER}{server}{yes}{no}} - transport = file - -client: - driver = accept - transport = send_to_server - -# ----- Transports - -begin transports - -send_to_server: - driver = smtp - allow_localhost - hosts = HOSTIPV4 - port = PORT_D - hosts_try_fastopen = : - -.ifdef FILTER - transport_filter = /bin/cat - DIR/aux-fixed/TESTNUM.mlistfooter -.endif -.ifndef ALLOW - hosts_try_chunking = : -.endif - - dkim_domain = test.ex -.ifdef SELECTOR - dkim_selector = SELECTOR -.else - dkim_selector = sel -.endif - - dkim_private_key = ${extract {${length_3:$dkim_selector}} {\ - ses=dkim512.private \ - sel=dkim.private \ - sed=dkim_ed25519.private \ - }{DDIR/$value}} - -.ifndef HEADERS_MAXSIZE - dkim_sign_headers = OPT -.else - dkim_identity = allheaders@$dkim_domain -.endif -.ifdef VALUE - dkim_hash = VALUE -.endif -.ifdef STRICT - dkim_strict = STRICT -.endif -.ifdef TIMES - dkim_timestamps = TIMES -.endif - -file: - driver = appendfile - file = DIR/test-mail/$local_part - create_file = DIR/test-mail - user = CALLER - -# End diff --git a/test/confs/4530 b/test/confs/4530 deleted file mode 120000 index a8ce02c97..000000000 --- a/test/confs/4530 +++ /dev/null @@ -1 +0,0 @@ -0906 \ No newline at end of file diff --git a/test/confs/4541 b/test/confs/4541 index 072f5faf2..a06e235b0 120000 --- a/test/confs/4541 +++ b/test/confs/4541 @@ -1 +1 @@ -4520 \ No newline at end of file +4510 \ No newline at end of file diff --git a/test/confs/4545 b/test/confs/4545 index 072f5faf2..a06e235b0 120000 --- a/test/confs/4545 +++ b/test/confs/4545 @@ -1 +1 @@ -4520 \ No newline at end of file +4510 \ No newline at end of file diff --git a/test/log/4510 b/test/log/4510 new file mode 100644 index 000000000..234624cc0 --- /dev/null +++ b/test/log/4510 @@ -0,0 +1,102 @@ +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for a@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 => a@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaZ-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b@test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 => b@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbB-0005vi-00" +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b10@test.ex +1999-03-02 09:44:33 10HmbC-0005vi-00 => b10@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbD-0005vi-00" +1999-03-02 09:44:33 10HmbC-0005vi-00 Completed +1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b12@test.ex +1999-03-02 09:44:33 10HmbE-0005vi-00 => b12@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbF-0005vi-00" +1999-03-02 09:44:33 10HmbE-0005vi-00 Completed +1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b20@test.ex +1999-03-02 09:44:33 10HmbG-0005vi-00 => b20@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbH-0005vi-00" +1999-03-02 09:44:33 10HmbG-0005vi-00 Completed +1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b22@test.ex +1999-03-02 09:44:33 10HmbI-0005vi-00 => b22@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbJ-0005vi-00" +1999-03-02 09:44:33 10HmbI-0005vi-00 Completed +1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for d@test.ex +1999-03-02 09:44:33 10HmbK-0005vi-00 => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbL-0005vi-00" +1999-03-02 09:44:33 10HmbK-0005vi-00 Completed +1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> U=CALLER P=local S=sss for e0@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand dkim_timestamps: unknown variable in "${bogus}" +1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: message could not be signed, and dkim_strict is set. Deferring message delivery. +1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: send() to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] failed: failed to expand dkim_timestamps: unknown variable in "${bogus}": Permission denied +1999-03-02 09:44:33 10HmaX-0005vi-00 == e0@test.ex R=client T=send_to_server defer (EEE): Permission denied H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: send() to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] failed: failed to expand dkim_timestamps: unknown variable in "${bogus}" +1999-03-02 09:44:33 10HmaX-0005vi-00 ** e0@test.ex: retry timeout exceeded +1999-03-02 09:44:33 10HmaX-0005vi-00 e0@test.ex: error ignored +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for e@test.ex +1999-03-02 09:44:33 10HmbM-0005vi-00 => e@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbN-0005vi-00" +1999-03-02 09:44:33 10HmbM-0005vi-00 Completed +1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for f@test.ex +1999-03-02 09:44:33 10HmbO-0005vi-00 => f@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbP-0005vi-00" +1999-03-02 09:44:33 10HmbO-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_D +1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmaZ-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From +1999-03-02 09:44:33 10HmaZ-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmaZ-0005vi-00 data_acl: dkim status pass +1999-03-02 09:44:33 10HmaZ-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 for a@test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 => a R=server_store T=file +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbB-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From:From +1999-03-02 09:44:33 10HmbB-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 t=T x=T+10 [verification succeeded] +1999-03-02 09:44:33 10HmbB-0005vi-00 data_acl: dkim status pass +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=E10HmbA-0005vi-00@myhost.test.ex for b@test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 => b R=server_store T=file +1999-03-02 09:44:33 10HmbB-0005vi-00 Completed +1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbD-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From +1999-03-02 09:44:33 10HmbD-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmbD-0005vi-00 data_acl: dkim status pass +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=esmtp S=sss id=E10HmbC-0005vi-00@myhost.test.ex for b10@test.ex +1999-03-02 09:44:33 10HmbD-0005vi-00 => b10 R=server_store T=file +1999-03-02 09:44:33 10HmbD-0005vi-00 Completed +1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbF-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=X-mine:X-mine:From +1999-03-02 09:44:33 10HmbF-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmbF-0005vi-00 data_acl: dkim status pass +1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbE-0005vi-00@myhost.test.ex for b12@test.ex +1999-03-02 09:44:33 10HmbF-0005vi-00 => b12 R=server_store T=file +1999-03-02 09:44:33 10HmbF-0005vi-00 Completed +1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbH-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=X-Mine +1999-03-02 09:44:33 10HmbH-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmbH-0005vi-00 data_acl: dkim status pass +1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbG-0005vi-00@myhost.test.ex for b20@test.ex +1999-03-02 09:44:33 10HmbH-0005vi-00 => b20 R=server_store T=file +1999-03-02 09:44:33 10HmbH-0005vi-00 Completed +1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbJ-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=X-mine:X-mine:X-Mine +1999-03-02 09:44:33 10HmbJ-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmbJ-0005vi-00 data_acl: dkim status pass +1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbI-0005vi-00@myhost.test.ex for b22@test.ex +1999-03-02 09:44:33 10HmbJ-0005vi-00 => b22 R=server_store T=file +1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed +1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbL-0005vi-00 DKIM: d=test.ex s=sel_bad [failed key import] +1999-03-02 09:44:33 10HmbL-0005vi-00 dkim_acl: signer: test.ex bits: 0 h=From +1999-03-02 09:44:33 10HmbL-0005vi-00 DKIM: d=test.ex s=sel_bad c=relaxed/relaxed a=rsa-sha256 b=1024 [invalid - syntax error in public key record] +1999-03-02 09:44:33 10HmbL-0005vi-00 data_acl: dkim status invalid +1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbK-0005vi-00@myhost.test.ex for d@test.ex +1999-03-02 09:44:33 10HmbL-0005vi-00 => d R=server_store T=file +1999-03-02 09:44:33 10HmbL-0005vi-00 Completed +1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 SMTP connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] lost while reading message data (header) +1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbN-0005vi-00 data_acl: dkim status +1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbM-0005vi-00@myhost.test.ex for e@test.ex +1999-03-02 09:44:33 10HmbN-0005vi-00 => e R=server_store T=file +1999-03-02 09:44:33 10HmbN-0005vi-00 Completed +1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbP-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From +1999-03-02 09:44:33 10HmbP-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmbP-0005vi-00 data_acl: dkim status pass +1999-03-02 09:44:33 10HmbP-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbO-0005vi-00@myhost.test.ex for f@test.ex +1999-03-02 09:44:33 10HmbP-0005vi-00 => f R=server_store T=file +1999-03-02 09:44:33 10HmbP-0005vi-00 Completed diff --git a/test/log/4511 b/test/log/4511 new file mode 100644 index 000000000..884906850 --- /dev/null +++ b/test/log/4511 @@ -0,0 +1,13 @@ +2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= sender@testhost.test.ex U=sender P=local S=sss for a@test.ex +2017-07-30 18:51:05.712 10HmaX-0005vi-00 => a@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 6nn byte chunk, total 6nn\\n250 OK id=10HmaY-0005vi-00" +2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed +2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= sender@testhost.test.ex U=sender P=local S=sss for b@test.ex +2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => b@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 8nn byte chunk, total 8nn\\n250 OK id=10HmbA-0005vi-00" +2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed + +******** SERVER ******** +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S +2017-07-30 18:51:05.712 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex id=E10HmaX-0005vi-00@testhost.test.ex for a@test.ex +2017-07-30 18:51:05.712 10HmbA-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex id=E10HmaZ-0005vi-00@testhost.test.ex for b@test.ex diff --git a/test/log/4512 b/test/log/4512 new file mode 100644 index 000000000..7abd59e3e --- /dev/null +++ b/test/log/4512 @@ -0,0 +1,7 @@ + +******** SERVER ******** +2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S +2017-07-30 18:51:05.712 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] +2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net for a@test.ex +2017-07-30 18:51:05.712 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] +2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net for a@test.ex diff --git a/test/log/4513 b/test/log/4513 new file mode 100644 index 000000000..cd1ba4fb9 --- /dev/null +++ b/test/log/4513 @@ -0,0 +1,13 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for a@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 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_D +1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From:From +1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha512 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmaY-0005vi-00 data_acl: dkim status pass +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex for a@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 => a R=server_store T=file +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/4514 b/test/log/4514 new file mode 100644 index 000000000..398c4b8e1 --- /dev/null +++ b/test/log/4514 @@ -0,0 +1,15 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for c@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 => c@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 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_D +1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 512 h=From:To:Subject +1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=ses c=relaxed/relaxed a=rsa-sha256 b=512 [verification succeeded] +1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From:To:Subject +1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmaY-0005vi-00 data_acl: dkim status pass:pass +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex for c@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 => c R=server_store T=file +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/4515 b/test/log/4515 new file mode 100644 index 000000000..f4b7496d5 --- /dev/null +++ b/test/log/4515 @@ -0,0 +1,48 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for a@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b@test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 => b@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for c@test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 => c@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] K C="250- 7nn byte chunk, total 7nn\\n250 OK id=10HmbC-0005vi-00" +1999-03-02 09:44:33 10HmbB-0005vi-00 Completed +1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b@test.ex +1999-03-02 09:44:33 10HmbD-0005vi-00 => b@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbE-0005vi-00" +1999-03-02 09:44:33 10HmbD-0005vi-00 Completed +1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for c@test.ex +1999-03-02 09:44:33 10HmbF-0005vi-00 => c@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] K C="250- 7nn byte chunk, total 7nn\\n250 OK id=10HmbG-0005vi-00" +1999-03-02 09:44:33 10HmbF-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_D +1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From +1999-03-02 09:44:33 10HmaY-0005vi-00 data acl: dkim status pass +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss DKIM=test.ex id=E10HmaX-0005vi-00@myhost.test.ex for a@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 => a R=server_store T=file +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbA-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From +1999-03-02 09:44:33 10HmbA-0005vi-00 data acl: dkim status pass +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 DKIM=test.ex id=E10HmaZ-0005vi-00@myhost.test.ex for b@test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 => b R=server_store T=file +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbC-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From +1999-03-02 09:44:33 10HmbC-0005vi-00 data acl: dkim status pass +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 K S=sss DKIM=test.ex id=E10HmbB-0005vi-00@myhost.test.ex for c@test.ex +1999-03-02 09:44:33 10HmbC-0005vi-00 => c R=server_store T=file +1999-03-02 09:44:33 10HmbC-0005vi-00 Completed +1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbE-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From +1999-03-02 09:44:33 10HmbE-0005vi-00 data acl: dkim status pass +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=esmtp S=sss DKIM=test.ex id=E10HmbD-0005vi-00@myhost.test.ex for b@test.ex +1999-03-02 09:44:33 10HmbE-0005vi-00 => b R=server_store T=file +1999-03-02 09:44:33 10HmbE-0005vi-00 Completed +1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbG-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From +1999-03-02 09:44:33 10HmbG-0005vi-00 data acl: dkim status pass +1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp K S=sss DKIM=test.ex id=E10HmbF-0005vi-00@myhost.test.ex for c@test.ex +1999-03-02 09:44:33 10HmbG-0005vi-00 => c R=server_store T=file +1999-03-02 09:44:33 10HmbG-0005vi-00 Completed diff --git a/test/log/4519 b/test/log/4519 new file mode 100644 index 000000000..b489d9c1d --- /dev/null +++ b/test/log/4519 @@ -0,0 +1,21 @@ +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmaX-0005vi-00 => z R=localuser T=local_delivery +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 => y R=localuser T=local_delivery +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S port PORT_D +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=esmtp S=sss for z@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex for z@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 no immediate delivery: queued by ACL +1999-03-02 09:44:33 10HmaZ-0005vi-00 => z@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 6nn byte chunk, total 6nn\\n250 OK id=10HmaX-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=esmtp K S=sss for y@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex for y@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL +1999-03-02 09:44:33 10HmbA-0005vi-00 => y@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 6nn byte chunk, total 6nn\\n250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed diff --git a/test/log/4520 b/test/log/4520 deleted file mode 100644 index 234624cc0..000000000 --- a/test/log/4520 +++ /dev/null @@ -1,102 +0,0 @@ -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for a@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 => a@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaZ-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b@test.ex -1999-03-02 09:44:33 10HmbA-0005vi-00 => b@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbB-0005vi-00" -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b10@test.ex -1999-03-02 09:44:33 10HmbC-0005vi-00 => b10@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbD-0005vi-00" -1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b12@test.ex -1999-03-02 09:44:33 10HmbE-0005vi-00 => b12@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbF-0005vi-00" -1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b20@test.ex -1999-03-02 09:44:33 10HmbG-0005vi-00 => b20@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbH-0005vi-00" -1999-03-02 09:44:33 10HmbG-0005vi-00 Completed -1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b22@test.ex -1999-03-02 09:44:33 10HmbI-0005vi-00 => b22@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbJ-0005vi-00" -1999-03-02 09:44:33 10HmbI-0005vi-00 Completed -1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for d@test.ex -1999-03-02 09:44:33 10HmbK-0005vi-00 => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbL-0005vi-00" -1999-03-02 09:44:33 10HmbK-0005vi-00 Completed -1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> U=CALLER P=local S=sss for e0@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand dkim_timestamps: unknown variable in "${bogus}" -1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: message could not be signed, and dkim_strict is set. Deferring message delivery. -1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: send() to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] failed: failed to expand dkim_timestamps: unknown variable in "${bogus}": Permission denied -1999-03-02 09:44:33 10HmaX-0005vi-00 == e0@test.ex R=client T=send_to_server defer (EEE): Permission denied H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: send() to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] failed: failed to expand dkim_timestamps: unknown variable in "${bogus}" -1999-03-02 09:44:33 10HmaX-0005vi-00 ** e0@test.ex: retry timeout exceeded -1999-03-02 09:44:33 10HmaX-0005vi-00 e0@test.ex: error ignored -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for e@test.ex -1999-03-02 09:44:33 10HmbM-0005vi-00 => e@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbN-0005vi-00" -1999-03-02 09:44:33 10HmbM-0005vi-00 Completed -1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for f@test.ex -1999-03-02 09:44:33 10HmbO-0005vi-00 => f@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbP-0005vi-00" -1999-03-02 09:44:33 10HmbO-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_D -1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmaZ-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From -1999-03-02 09:44:33 10HmaZ-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmaZ-0005vi-00 data_acl: dkim status pass -1999-03-02 09:44:33 10HmaZ-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 for a@test.ex -1999-03-02 09:44:33 10HmaZ-0005vi-00 => a R=server_store T=file -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmbB-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From:From -1999-03-02 09:44:33 10HmbB-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 t=T x=T+10 [verification succeeded] -1999-03-02 09:44:33 10HmbB-0005vi-00 data_acl: dkim status pass -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=E10HmbA-0005vi-00@myhost.test.ex for b@test.ex -1999-03-02 09:44:33 10HmbB-0005vi-00 => b R=server_store T=file -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmbD-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From -1999-03-02 09:44:33 10HmbD-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmbD-0005vi-00 data_acl: dkim status pass -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=esmtp S=sss id=E10HmbC-0005vi-00@myhost.test.ex for b10@test.ex -1999-03-02 09:44:33 10HmbD-0005vi-00 => b10 R=server_store T=file -1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmbF-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=X-mine:X-mine:From -1999-03-02 09:44:33 10HmbF-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmbF-0005vi-00 data_acl: dkim status pass -1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbE-0005vi-00@myhost.test.ex for b12@test.ex -1999-03-02 09:44:33 10HmbF-0005vi-00 => b12 R=server_store T=file -1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmbH-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=X-Mine -1999-03-02 09:44:33 10HmbH-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmbH-0005vi-00 data_acl: dkim status pass -1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbG-0005vi-00@myhost.test.ex for b20@test.ex -1999-03-02 09:44:33 10HmbH-0005vi-00 => b20 R=server_store T=file -1999-03-02 09:44:33 10HmbH-0005vi-00 Completed -1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmbJ-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=X-mine:X-mine:X-Mine -1999-03-02 09:44:33 10HmbJ-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmbJ-0005vi-00 data_acl: dkim status pass -1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbI-0005vi-00@myhost.test.ex for b22@test.ex -1999-03-02 09:44:33 10HmbJ-0005vi-00 => b22 R=server_store T=file -1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed -1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmbL-0005vi-00 DKIM: d=test.ex s=sel_bad [failed key import] -1999-03-02 09:44:33 10HmbL-0005vi-00 dkim_acl: signer: test.ex bits: 0 h=From -1999-03-02 09:44:33 10HmbL-0005vi-00 DKIM: d=test.ex s=sel_bad c=relaxed/relaxed a=rsa-sha256 b=1024 [invalid - syntax error in public key record] -1999-03-02 09:44:33 10HmbL-0005vi-00 data_acl: dkim status invalid -1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbK-0005vi-00@myhost.test.ex for d@test.ex -1999-03-02 09:44:33 10HmbL-0005vi-00 => d R=server_store T=file -1999-03-02 09:44:33 10HmbL-0005vi-00 Completed -1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 SMTP connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] lost while reading message data (header) -1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmbN-0005vi-00 data_acl: dkim status -1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbM-0005vi-00@myhost.test.ex for e@test.ex -1999-03-02 09:44:33 10HmbN-0005vi-00 => e R=server_store T=file -1999-03-02 09:44:33 10HmbN-0005vi-00 Completed -1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmbP-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From -1999-03-02 09:44:33 10HmbP-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmbP-0005vi-00 data_acl: dkim status pass -1999-03-02 09:44:33 10HmbP-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbO-0005vi-00@myhost.test.ex for f@test.ex -1999-03-02 09:44:33 10HmbP-0005vi-00 => f R=server_store T=file -1999-03-02 09:44:33 10HmbP-0005vi-00 Completed diff --git a/test/log/4521 b/test/log/4521 deleted file mode 100644 index 884906850..000000000 --- a/test/log/4521 +++ /dev/null @@ -1,13 +0,0 @@ -2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= sender@testhost.test.ex U=sender P=local S=sss for a@test.ex -2017-07-30 18:51:05.712 10HmaX-0005vi-00 => a@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 6nn byte chunk, total 6nn\\n250 OK id=10HmaY-0005vi-00" -2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed -2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= sender@testhost.test.ex U=sender P=local S=sss for b@test.ex -2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => b@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 8nn byte chunk, total 8nn\\n250 OK id=10HmbA-0005vi-00" -2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed - -******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S -2017-07-30 18:51:05.712 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex id=E10HmaX-0005vi-00@testhost.test.ex for a@test.ex -2017-07-30 18:51:05.712 10HmbA-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex id=E10HmaZ-0005vi-00@testhost.test.ex for b@test.ex diff --git a/test/log/4522 b/test/log/4522 deleted file mode 100644 index 7abd59e3e..000000000 --- a/test/log/4522 +++ /dev/null @@ -1,7 +0,0 @@ - -******** SERVER ******** -2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S -2017-07-30 18:51:05.712 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] -2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net for a@test.ex -2017-07-30 18:51:05.712 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha256 b=1024 [verification succeeded] -2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net for a@test.ex diff --git a/test/log/4523 b/test/log/4523 deleted file mode 100644 index cd1ba4fb9..000000000 --- a/test/log/4523 +++ /dev/null @@ -1,13 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for a@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 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_D -1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From:From -1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha512 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmaY-0005vi-00 data_acl: dkim status pass -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex for a@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 => a R=server_store T=file -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/4524 b/test/log/4524 deleted file mode 100644 index 398c4b8e1..000000000 --- a/test/log/4524 +++ /dev/null @@ -1,15 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for c@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 => c@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 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_D -1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 512 h=From:To:Subject -1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=ses c=relaxed/relaxed a=rsa-sha256 b=512 [verification succeeded] -1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From:To:Subject -1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmaY-0005vi-00 data_acl: dkim status pass:pass -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex for c@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 => c R=server_store T=file -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/4525 b/test/log/4525 deleted file mode 100644 index f4b7496d5..000000000 --- a/test/log/4525 +++ /dev/null @@ -1,48 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for a@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaY-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b@test.ex -1999-03-02 09:44:33 10HmaZ-0005vi-00 => b@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for c@test.ex -1999-03-02 09:44:33 10HmbB-0005vi-00 => c@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] K C="250- 7nn byte chunk, total 7nn\\n250 OK id=10HmbC-0005vi-00" -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b@test.ex -1999-03-02 09:44:33 10HmbD-0005vi-00 => b@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbE-0005vi-00" -1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for c@test.ex -1999-03-02 09:44:33 10HmbF-0005vi-00 => c@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] K C="250- 7nn byte chunk, total 7nn\\n250 OK id=10HmbG-0005vi-00" -1999-03-02 09:44:33 10HmbF-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_D -1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From -1999-03-02 09:44:33 10HmaY-0005vi-00 data acl: dkim status pass -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss DKIM=test.ex id=E10HmaX-0005vi-00@myhost.test.ex for a@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 => a R=server_store T=file -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmbA-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From -1999-03-02 09:44:33 10HmbA-0005vi-00 data acl: dkim status pass -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 DKIM=test.ex id=E10HmaZ-0005vi-00@myhost.test.ex for b@test.ex -1999-03-02 09:44:33 10HmbA-0005vi-00 => b R=server_store T=file -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmbC-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From -1999-03-02 09:44:33 10HmbC-0005vi-00 data acl: dkim status pass -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 K S=sss DKIM=test.ex id=E10HmbB-0005vi-00@myhost.test.ex for c@test.ex -1999-03-02 09:44:33 10HmbC-0005vi-00 => c R=server_store T=file -1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmbE-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From -1999-03-02 09:44:33 10HmbE-0005vi-00 data acl: dkim status pass -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=esmtp S=sss DKIM=test.ex id=E10HmbD-0005vi-00@myhost.test.ex for b@test.ex -1999-03-02 09:44:33 10HmbE-0005vi-00 => b R=server_store T=file -1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive -1999-03-02 09:44:33 10HmbG-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From -1999-03-02 09:44:33 10HmbG-0005vi-00 data acl: dkim status pass -1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp K S=sss DKIM=test.ex id=E10HmbF-0005vi-00@myhost.test.ex for c@test.ex -1999-03-02 09:44:33 10HmbG-0005vi-00 => c R=server_store T=file -1999-03-02 09:44:33 10HmbG-0005vi-00 Completed diff --git a/test/log/4530 b/test/log/4530 deleted file mode 100644 index b489d9c1d..000000000 --- a/test/log/4530 +++ /dev/null @@ -1,21 +0,0 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 => z R=localuser T=local_delivery -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => y R=localuser T=local_delivery -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_S port PORT_D -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=esmtp S=sss for z@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex for z@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 no immediate delivery: queued by ACL -1999-03-02 09:44:33 10HmaZ-0005vi-00 => z@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 6nn byte chunk, total 6nn\\n250 OK id=10HmaX-0005vi-00" -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=esmtp K S=sss for y@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss DKIM=test.ex for y@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL -1999-03-02 09:44:33 10HmbA-0005vi-00 => y@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 6nn byte chunk, total 6nn\\n250 OK id=10HmaY-0005vi-00" -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed diff --git a/test/mail/4510.a b/test/mail/4510.a new file mode 100644 index 000000000..39d075866 --- /dev/null +++ b/test/mail/4510.a @@ -0,0 +1,25 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmaZ-0005vi-00 + for a@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=LygSZ5OCGlY + /fF+ReGidcyXZw1l+NbhyXEkQYrSrQV/BqEL34Ql4v7PS6BPwkkdSojQ+b6vZUKwiFV5SoWb81N06 + uJclVeogVylhuTqn6kGZWBX8eSh46NRjisXB8dn9KDdUc7ZKjIWKUdRAR5ssGIu7FE4kvc9FxlcOM + jSeqgM=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaY-0005vi-00 + for a@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +From: second@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + diff --git a/test/mail/4510.b b/test/mail/4510.b new file mode 100644 index 000000000..9fb69146d --- /dev/null +++ b/test/mail/4510.b @@ -0,0 +1,22 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmbB-0005vi-00 + for b@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=From:From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; + t=T; x=T+10; b=bbbb; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbA-0005vi-00 + for b@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + diff --git a/test/mail/4510.b10 b/test/mail/4510.b10 new file mode 100644 index 000000000..9b33d6fcf --- /dev/null +++ b/test/mail/4510.b10 @@ -0,0 +1,24 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmbD-0005vi-00 + for b10@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=toy5chxow6W + 7Nn3qMvjZs+i0H00bQfi+6nakV6i36cRrZM/oWziHrc5IfYZuQunWNUA9UHnatK35Nsl7ZJRBU4em + wtzdO60jXnH7ZVyYjKxqTow9uCuuBKCgXdKxt1hpEfY0m7uUKt9OaqA0464NH5wEC4o/pt1aReidE + hvI6IY=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbC-0005vi-00 + for b10@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + diff --git a/test/mail/4510.b12 b/test/mail/4510.b12 new file mode 100644 index 000000000..b41f7e515 --- /dev/null +++ b/test/mail/4510.b12 @@ -0,0 +1,26 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmbF-0005vi-00 + for b12@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=X-mine:X-mine:From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; + b=VSF3Fmf7fHLpqKWgaG0t/RJdd+7JJNRN/+q7Gcz0xtIOjt5tL4Pfc4VDSeQYPq6e1pCcjvj79k5 + 7of1wr0KIfk5FAvUZXPu3OtRm71y1X2rUaQB8c2Y2SROSMyaT3tsPzaEigiptIeeOkULYkFl2Hln1 + 5ssCcfufIlOx4EQ9fQA=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbE-0005vi-00 + for b12@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +X-mine: one +X-mine: two +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + diff --git a/test/mail/4510.b20 b/test/mail/4510.b20 new file mode 100644 index 000000000..02da74c7e --- /dev/null +++ b/test/mail/4510.b20 @@ -0,0 +1,24 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmbH-0005vi-00 + for b20@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=X-Mine; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=VJ0NOLNRm + RSvCCwV1TxNy+33gc34TrxCjTDl12GiW4E1N92MQwuhgzUPStxZDI+A8BqK/OFovhEwz775NfUgAz + nQGPCSfm2TsJVo2bmg67261OJWbcJr4IJ7uNUKTBqnmpySlubIIHMbsmqJHnVBp5wUPZ4wUazkKJh + d6xCVBLk=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbG-0005vi-00 + for b20@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + diff --git a/test/mail/4510.b22 b/test/mail/4510.b22 new file mode 100644 index 000000000..bf687ffdb --- /dev/null +++ b/test/mail/4510.b22 @@ -0,0 +1,26 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmbJ-0005vi-00 + for b22@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=X-mine:X-mine:X-Mine; + bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=xdhDHWeO9R0K1mMCManMqUGXH3 + 8js7wRlfof31603TebtErSiSY53U83IQ4B0/xpbWwPE5/oXEkWyzip0kM8Kyy1kkgkfaWilY8BhPt + /Bzt2ejTfNt7cbQQYHDLajY/q/9W6bGzJm4fBzrWrYgqfvyeXpb8jp2QkwO9zmGMiqmI=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbI-0005vi-00 + for b22@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +X-mine: one +X-mine: two +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + diff --git a/test/mail/4510.d b/test/mail/4510.d new file mode 100644 index 000000000..b8b5aec98 --- /dev/null +++ b/test/mail/4510.d @@ -0,0 +1,24 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmbL-0005vi-00 + for d@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel_bad; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=pL614V/ + QAEOFdf403ELt483LzdOxQoo+jSheIIOxccgWFWz7HRjVGASRCU20k2GlYfRomm/tVkp+vf1yw6Oj + WNTOLNWZFHCXtLMXPpDobKOxzYuvjEKpWVsTNI5JFzM9bGmQhbWqgxu6YkDTRcZX46bKrE5zJ49B9 + QXXNtNEbKg=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbK-0005vi-00 + for d@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + diff --git a/test/mail/4510.e b/test/mail/4510.e new file mode 100644 index 000000000..3b9931e1d --- /dev/null +++ b/test/mail/4510.e @@ -0,0 +1,19 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmbN-0005vi-00 + for e@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 10HmbM-0005vi-00 + for e@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + diff --git a/test/mail/4510.f b/test/mail/4510.f new file mode 100644 index 000000000..cc8bc6306 --- /dev/null +++ b/test/mail/4510.f @@ -0,0 +1,24 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmbP-0005vi-00 + for f@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=From; bh=gs+F4Uhr+N4qZhWyfctULkCwprl/tvOnzqNhsmpAFW4=; b=A3l0nyvB3OK + NuIDfQJg0wynUUH4AWSRdDUNmhkTNo2RW/ifLCWBky6AXfkaHENJRewncjoVcn92d0cbTF4gDEhUi + EbuJRdYja2OJT25BUgLfrxQnNnYB7TB9PcWG3Mrmq0fGRgCNngyh5gLHGqu9tBllw5Pdigbq2EAV0 + t2W/iI=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbO-0005vi-00 + for f@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +..content + diff --git a/test/mail/4513.a b/test/mail/4513.a new file mode 100644 index 000000000..ea00a459b --- /dev/null +++ b/test/mail/4513.a @@ -0,0 +1,24 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmaY-0005vi-00 + for a@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha512; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=From:From; bh=6B2m0DINYQYGHTvmDYQAfAm/wCDFh+Oj57jE2G4jz4nAeJfmjTB6tz + me+A5nT6AQ4J3N47vffXLG1exv8bzFZw==; b=YFIC4khvqvXRd8I3r3YTdQqG/SbtDIAYTYVkIo3 + W7Qe+42eI+w1koPY+ocPtZeRBWWjGVbnZNtof7s5x0sRc6fSDZJAQu6RjnP2xEJWsivowXBMuu8id + PtqcDhP/3Q/0W85VMalfSC7eCgpnNxfn73ZjPuBZFCc1wMVh5nUmUvo=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for a@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + diff --git a/test/mail/4514.c b/test/mail/4514.c new file mode 100644 index 000000000..8e61da1da --- /dev/null +++ b/test/mail/4514.c @@ -0,0 +1,28 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmaY-0005vi-00 + for c@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=ses; h=From:To:Subject; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b= + hjRHwrwAxKFsul1+Bj1XU0YSi0cMQO5hzSItwtaAP++3E9DdxAzeenuRmCyL4o5NQSWY9gMArptRz + C+SlzhM6A==; +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=From:To:Subject; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b= + Nl9zWo9kgHM3r0dQF7ACBkLLmXIm3EoW2pkpEBQOIcLJdXg9A7QFo13KsChDlG3cQtqUFDI9ASaKn + 5fUG3yKEnWPBDNftcIj4+iP0TYYOB9eRw/wddfszZJLIR60y2HCOZVyQB/tf6f+J/eDfxm+ic2pvR + L4dHw+Uo7oZUzJgpU=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for c@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + diff --git a/test/mail/4515.a b/test/mail/4515.a new file mode 100644 index 000000000..7a8b89cd0 --- /dev/null +++ b/test/mail/4515.a @@ -0,0 +1,24 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmaY-0005vi-00 + for a@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=toy5chxow6W + 7Nn3qMvjZs+i0H00bQfi+6nakV6i36cRrZM/oWziHrc5IfYZuQunWNUA9UHnatK35Nsl7ZJRBU4em + wtzdO60jXnH7ZVyYjKxqTow9uCuuBKCgXdKxt1hpEfY0m7uUKt9OaqA0464NH5wEC4o/pt1aReidE + hvI6IY=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for a@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + diff --git a/test/mail/4515.b b/test/mail/4515.b new file mode 100644 index 000000000..e47b388eb --- /dev/null +++ b/test/mail/4515.b @@ -0,0 +1,56 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmbA-0005vi-00 + for b@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL + wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM + ncfURg55wr8fftAyRFA/L/svtP8h3Qv/+jv8gJ9nHyjk3z7Zmzzo8S54h9Ct9pJwkv0cpmdeLiDrL + ygZGjs=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaZ-0005vi-00 + for b@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + +-- +This is a generic mailinglist footer, using a traditional .sig-separator line +---- + +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmbE-0005vi-00 + for b@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL + wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM + ncfURg55wr8fftAyRFA/L/svtP8h3Qv/+jv8gJ9nHyjk3z7Zmzzo8S54h9Ct9pJwkv0cpmdeLiDrL + ygZGjs=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbD-0005vi-00 + for b@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + +-- +This is a generic mailinglist footer, using a traditional .sig-separator line +---- + diff --git a/test/mail/4515.c b/test/mail/4515.c new file mode 100644 index 000000000..a908d75ed --- /dev/null +++ b/test/mail/4515.c @@ -0,0 +1,56 @@ +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmbC-0005vi-00 + for c@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL + wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM + ncfURg55wr8fftAyRFA/L/svtP8h3Qv/+jv8gJ9nHyjk3z7Zmzzo8S54h9Ct9pJwkv0cpmdeLiDrL + ygZGjs=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbB-0005vi-00 + for c@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + +-- +This is a generic mailinglist footer, using a traditional .sig-separator line +---- + +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 esmtp (Exim x.yz) + (envelope-from ) + id 10HmbG-0005vi-00 + for c@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL + wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM + ncfURg55wr8fftAyRFA/L/svtP8h3Qv/+jv8gJ9nHyjk3z7Zmzzo8S54h9Ct9pJwkv0cpmdeLiDrL + ygZGjs=; +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbF-0005vi-00 + for c@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + +-- +This is a generic mailinglist footer, using a traditional .sig-separator line +---- + diff --git a/test/mail/4519.y b/test/mail/4519.y new file mode 100644 index 000000000..8b932d642 --- /dev/null +++ b/test/mail/4519.y @@ -0,0 +1,28 @@ +From MAILER-DAEMON Tue Mar 02 09:44:33 1999 +Return-path: <> +Received: from localhost ([127.0.0.1] helo=testhost.test.ex) + by testhost.test.ex with esmtp (Exim x.yz) + id 10HmaY-0005vi-00 + for y@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=Subject; bh=CVpkzY75tV/NCKk5pPx4GnM3NX83xwCiT0xVwo0G1Rs=; b=JTYpVY1D + sO37MibaZTC2CgpQAZlz/lRefFQv3Q7JM4D0aUfseT24Xg+kxv3xc5guSzKWQzycm3zie366tHape + lu70O4/5+Dyr0f/FKjmYxT+ALcIzuVN7Rty2JioBG07aryqJqmcR0xpmiggctb/h/2a/JGRKPcDWO + psj50XQNQ=; +Received: from [127.0.0.1] (helo=xxx) + by testhost.test.ex with esmtp (Exim x.yz) + (envelope-from ) + id 10HmbA-0005vi-00 + for y@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +Subject: simple test +X-body-linecount: 0 +X-message-linecount: 17 +X-received-count: 2 + +Line 1: This is a simple test. +Line 2: This is a simple test. +.Line 3 has a leading dot +last line: 4 + diff --git a/test/mail/4519.z b/test/mail/4519.z new file mode 100644 index 000000000..777e6a6ef --- /dev/null +++ b/test/mail/4519.z @@ -0,0 +1,28 @@ +From MAILER-DAEMON Tue Mar 02 09:44:33 1999 +Return-path: <> +Received: from localhost ([127.0.0.1] helo=testhost.test.ex) + by testhost.test.ex with esmtp (Exim x.yz) + id 10HmaX-0005vi-00 + for z@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; + s=sel; h=Subject; bh=CVpkzY75tV/NCKk5pPx4GnM3NX83xwCiT0xVwo0G1Rs=; b=JTYpVY1D + sO37MibaZTC2CgpQAZlz/lRefFQv3Q7JM4D0aUfseT24Xg+kxv3xc5guSzKWQzycm3zie366tHape + lu70O4/5+Dyr0f/FKjmYxT+ALcIzuVN7Rty2JioBG07aryqJqmcR0xpmiggctb/h/2a/JGRKPcDWO + psj50XQNQ=; +Received: from [127.0.0.1] (helo=xxx) + by testhost.test.ex with esmtp (Exim x.yz) + (envelope-from ) + id 10HmaZ-0005vi-00 + for z@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +Subject: simple test +X-body-linecount: 0 +X-message-linecount: 17 +X-received-count: 2 + +Line 1: This is a simple test. +Line 2: This is a simple test. +.Line 3 has a leading dot +last line: 4 + diff --git a/test/mail/4520.a b/test/mail/4520.a deleted file mode 100644 index 39d075866..000000000 --- a/test/mail/4520.a +++ /dev/null @@ -1,25 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00 - for a@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=LygSZ5OCGlY - /fF+ReGidcyXZw1l+NbhyXEkQYrSrQV/BqEL34Ql4v7PS6BPwkkdSojQ+b6vZUKwiFV5SoWb81N06 - uJclVeogVylhuTqn6kGZWBX8eSh46NRjisXB8dn9KDdUc7ZKjIWKUdRAR5ssGIu7FE4kvc9FxlcOM - jSeqgM=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00 - for a@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -From: second@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - diff --git a/test/mail/4520.b b/test/mail/4520.b deleted file mode 100644 index 9fb69146d..000000000 --- a/test/mail/4520.b +++ /dev/null @@ -1,22 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmbB-0005vi-00 - for b@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=From:From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; - t=T; x=T+10; b=bbbb; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00 - for b@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - diff --git a/test/mail/4520.b10 b/test/mail/4520.b10 deleted file mode 100644 index 9b33d6fcf..000000000 --- a/test/mail/4520.b10 +++ /dev/null @@ -1,24 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmbD-0005vi-00 - for b10@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=toy5chxow6W - 7Nn3qMvjZs+i0H00bQfi+6nakV6i36cRrZM/oWziHrc5IfYZuQunWNUA9UHnatK35Nsl7ZJRBU4em - wtzdO60jXnH7ZVyYjKxqTow9uCuuBKCgXdKxt1hpEfY0m7uUKt9OaqA0464NH5wEC4o/pt1aReidE - hvI6IY=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbC-0005vi-00 - for b10@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - diff --git a/test/mail/4520.b12 b/test/mail/4520.b12 deleted file mode 100644 index b41f7e515..000000000 --- a/test/mail/4520.b12 +++ /dev/null @@ -1,26 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmbF-0005vi-00 - for b12@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=X-mine:X-mine:From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; - b=VSF3Fmf7fHLpqKWgaG0t/RJdd+7JJNRN/+q7Gcz0xtIOjt5tL4Pfc4VDSeQYPq6e1pCcjvj79k5 - 7of1wr0KIfk5FAvUZXPu3OtRm71y1X2rUaQB8c2Y2SROSMyaT3tsPzaEigiptIeeOkULYkFl2Hln1 - 5ssCcfufIlOx4EQ9fQA=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbE-0005vi-00 - for b12@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -X-mine: one -X-mine: two -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - diff --git a/test/mail/4520.b20 b/test/mail/4520.b20 deleted file mode 100644 index 02da74c7e..000000000 --- a/test/mail/4520.b20 +++ /dev/null @@ -1,24 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmbH-0005vi-00 - for b20@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=X-Mine; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=VJ0NOLNRm - RSvCCwV1TxNy+33gc34TrxCjTDl12GiW4E1N92MQwuhgzUPStxZDI+A8BqK/OFovhEwz775NfUgAz - nQGPCSfm2TsJVo2bmg67261OJWbcJr4IJ7uNUKTBqnmpySlubIIHMbsmqJHnVBp5wUPZ4wUazkKJh - d6xCVBLk=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbG-0005vi-00 - for b20@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - diff --git a/test/mail/4520.b22 b/test/mail/4520.b22 deleted file mode 100644 index bf687ffdb..000000000 --- a/test/mail/4520.b22 +++ /dev/null @@ -1,26 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmbJ-0005vi-00 - for b22@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=X-mine:X-mine:X-Mine; - bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=xdhDHWeO9R0K1mMCManMqUGXH3 - 8js7wRlfof31603TebtErSiSY53U83IQ4B0/xpbWwPE5/oXEkWyzip0kM8Kyy1kkgkfaWilY8BhPt - /Bzt2ejTfNt7cbQQYHDLajY/q/9W6bGzJm4fBzrWrYgqfvyeXpb8jp2QkwO9zmGMiqmI=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbI-0005vi-00 - for b22@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -X-mine: one -X-mine: two -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - diff --git a/test/mail/4520.d b/test/mail/4520.d deleted file mode 100644 index b8b5aec98..000000000 --- a/test/mail/4520.d +++ /dev/null @@ -1,24 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmbL-0005vi-00 - for d@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel_bad; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=pL614V/ - QAEOFdf403ELt483LzdOxQoo+jSheIIOxccgWFWz7HRjVGASRCU20k2GlYfRomm/tVkp+vf1yw6Oj - WNTOLNWZFHCXtLMXPpDobKOxzYuvjEKpWVsTNI5JFzM9bGmQhbWqgxu6YkDTRcZX46bKrE5zJ49B9 - QXXNtNEbKg=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbK-0005vi-00 - for d@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - diff --git a/test/mail/4520.e b/test/mail/4520.e deleted file mode 100644 index 3b9931e1d..000000000 --- a/test/mail/4520.e +++ /dev/null @@ -1,19 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmbN-0005vi-00 - for e@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 10HmbM-0005vi-00 - for e@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - diff --git a/test/mail/4520.f b/test/mail/4520.f deleted file mode 100644 index cc8bc6306..000000000 --- a/test/mail/4520.f +++ /dev/null @@ -1,24 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmbP-0005vi-00 - for f@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=From; bh=gs+F4Uhr+N4qZhWyfctULkCwprl/tvOnzqNhsmpAFW4=; b=A3l0nyvB3OK - NuIDfQJg0wynUUH4AWSRdDUNmhkTNo2RW/ifLCWBky6AXfkaHENJRewncjoVcn92d0cbTF4gDEhUi - EbuJRdYja2OJT25BUgLfrxQnNnYB7TB9PcWG3Mrmq0fGRgCNngyh5gLHGqu9tBllw5Pdigbq2EAV0 - t2W/iI=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbO-0005vi-00 - for f@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -..content - diff --git a/test/mail/4523.a b/test/mail/4523.a deleted file mode 100644 index ea00a459b..000000000 --- a/test/mail/4523.a +++ /dev/null @@ -1,24 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00 - for a@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha512; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=From:From; bh=6B2m0DINYQYGHTvmDYQAfAm/wCDFh+Oj57jE2G4jz4nAeJfmjTB6tz - me+A5nT6AQ4J3N47vffXLG1exv8bzFZw==; b=YFIC4khvqvXRd8I3r3YTdQqG/SbtDIAYTYVkIo3 - W7Qe+42eI+w1koPY+ocPtZeRBWWjGVbnZNtof7s5x0sRc6fSDZJAQu6RjnP2xEJWsivowXBMuu8id - PtqcDhP/3Q/0W85VMalfSC7eCgpnNxfn73ZjPuBZFCc1wMVh5nUmUvo=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for a@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - diff --git a/test/mail/4524.c b/test/mail/4524.c deleted file mode 100644 index 8e61da1da..000000000 --- a/test/mail/4524.c +++ /dev/null @@ -1,28 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00 - for c@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=ses; h=From:To:Subject; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b= - hjRHwrwAxKFsul1+Bj1XU0YSi0cMQO5hzSItwtaAP++3E9DdxAzeenuRmCyL4o5NQSWY9gMArptRz - C+SlzhM6A==; -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=From:To:Subject; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b= - Nl9zWo9kgHM3r0dQF7ACBkLLmXIm3EoW2pkpEBQOIcLJdXg9A7QFo13KsChDlG3cQtqUFDI9ASaKn - 5fUG3yKEnWPBDNftcIj4+iP0TYYOB9eRw/wddfszZJLIR60y2HCOZVyQB/tf6f+J/eDfxm+ic2pvR - L4dHw+Uo7oZUzJgpU=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for c@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - diff --git a/test/mail/4525.a b/test/mail/4525.a deleted file mode 100644 index 7a8b89cd0..000000000 --- a/test/mail/4525.a +++ /dev/null @@ -1,24 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00 - for a@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=toy5chxow6W - 7Nn3qMvjZs+i0H00bQfi+6nakV6i36cRrZM/oWziHrc5IfYZuQunWNUA9UHnatK35Nsl7ZJRBU4em - wtzdO60jXnH7ZVyYjKxqTow9uCuuBKCgXdKxt1hpEfY0m7uUKt9OaqA0464NH5wEC4o/pt1aReidE - hvI6IY=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for a@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - diff --git a/test/mail/4525.b b/test/mail/4525.b deleted file mode 100644 index e47b388eb..000000000 --- a/test/mail/4525.b +++ /dev/null @@ -1,56 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00 - for b@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL - wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM - ncfURg55wr8fftAyRFA/L/svtP8h3Qv/+jv8gJ9nHyjk3z7Zmzzo8S54h9Ct9pJwkv0cpmdeLiDrL - ygZGjs=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00 - for b@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - --- -This is a generic mailinglist footer, using a traditional .sig-separator line ----- - -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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmbE-0005vi-00 - for b@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL - wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM - ncfURg55wr8fftAyRFA/L/svtP8h3Qv/+jv8gJ9nHyjk3z7Zmzzo8S54h9Ct9pJwkv0cpmdeLiDrL - ygZGjs=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbD-0005vi-00 - for b@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - --- -This is a generic mailinglist footer, using a traditional .sig-separator line ----- - diff --git a/test/mail/4525.c b/test/mail/4525.c deleted file mode 100644 index a908d75ed..000000000 --- a/test/mail/4525.c +++ /dev/null @@ -1,56 +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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmbC-0005vi-00 - for c@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL - wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM - ncfURg55wr8fftAyRFA/L/svtP8h3Qv/+jv8gJ9nHyjk3z7Zmzzo8S54h9Ct9pJwkv0cpmdeLiDrL - ygZGjs=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbB-0005vi-00 - for c@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - --- -This is a generic mailinglist footer, using a traditional .sig-separator line ----- - -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 esmtp (Exim x.yz) - (envelope-from ) - id 10HmbG-0005vi-00 - for c@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL - wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM - ncfURg55wr8fftAyRFA/L/svtP8h3Qv/+jv8gJ9nHyjk3z7Zmzzo8S54h9Ct9pJwkv0cpmdeLiDrL - ygZGjs=; -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbF-0005vi-00 - for c@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - --- -This is a generic mailinglist footer, using a traditional .sig-separator line ----- - diff --git a/test/mail/4530.y b/test/mail/4530.y deleted file mode 100644 index 8b932d642..000000000 --- a/test/mail/4530.y +++ /dev/null @@ -1,28 +0,0 @@ -From MAILER-DAEMON Tue Mar 02 09:44:33 1999 -Return-path: <> -Received: from localhost ([127.0.0.1] helo=testhost.test.ex) - by testhost.test.ex with esmtp (Exim x.yz) - id 10HmaY-0005vi-00 - for y@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=Subject; bh=CVpkzY75tV/NCKk5pPx4GnM3NX83xwCiT0xVwo0G1Rs=; b=JTYpVY1D - sO37MibaZTC2CgpQAZlz/lRefFQv3Q7JM4D0aUfseT24Xg+kxv3xc5guSzKWQzycm3zie366tHape - lu70O4/5+Dyr0f/FKjmYxT+ALcIzuVN7Rty2JioBG07aryqJqmcR0xpmiggctb/h/2a/JGRKPcDWO - psj50XQNQ=; -Received: from [127.0.0.1] (helo=xxx) - by testhost.test.ex with esmtp (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00 - for y@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -Subject: simple test -X-body-linecount: 0 -X-message-linecount: 17 -X-received-count: 2 - -Line 1: This is a simple test. -Line 2: This is a simple test. -.Line 3 has a leading dot -last line: 4 - diff --git a/test/mail/4530.z b/test/mail/4530.z deleted file mode 100644 index 777e6a6ef..000000000 --- a/test/mail/4530.z +++ /dev/null @@ -1,28 +0,0 @@ -From MAILER-DAEMON Tue Mar 02 09:44:33 1999 -Return-path: <> -Received: from localhost ([127.0.0.1] helo=testhost.test.ex) - by testhost.test.ex with esmtp (Exim x.yz) - id 10HmaX-0005vi-00 - for z@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex; - s=sel; h=Subject; bh=CVpkzY75tV/NCKk5pPx4GnM3NX83xwCiT0xVwo0G1Rs=; b=JTYpVY1D - sO37MibaZTC2CgpQAZlz/lRefFQv3Q7JM4D0aUfseT24Xg+kxv3xc5guSzKWQzycm3zie366tHape - lu70O4/5+Dyr0f/FKjmYxT+ALcIzuVN7Rty2JioBG07aryqJqmcR0xpmiggctb/h/2a/JGRKPcDWO - psj50XQNQ=; -Received: from [127.0.0.1] (helo=xxx) - by testhost.test.ex with esmtp (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00 - for z@test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -Subject: simple test -X-body-linecount: 0 -X-message-linecount: 17 -X-received-count: 2 - -Line 1: This is a simple test. -Line 2: This is a simple test. -.Line 3 has a leading dot -last line: 4 - diff --git a/test/paniclog/4510 b/test/paniclog/4510 new file mode 100644 index 000000000..ef060aaa0 --- /dev/null +++ b/test/paniclog/4510 @@ -0,0 +1 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand dkim_timestamps: unknown variable in "${bogus}" diff --git a/test/paniclog/4520 b/test/paniclog/4520 deleted file mode 100644 index ef060aaa0..000000000 --- a/test/paniclog/4520 +++ /dev/null @@ -1 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand dkim_timestamps: unknown variable in "${bogus}" diff --git a/test/scripts/4500-DKIM/4510 b/test/scripts/4500-DKIM/4510 new file mode 100644 index 000000000..f073be9d3 --- /dev/null +++ b/test/scripts/4500-DKIM/4510 @@ -0,0 +1,92 @@ +# DKIM signing +# +exim -bd -DSERVER=server -oX PORT_D +**** +# +# single header signed +exim -DOPT=From -odf a@test.ex +From: nobody@example.com +From: second@example.com + +content +**** +# +# single header, oversigned, with timestamps +exim -DOPT=From:From -DTIMES=10 -odf b@test.ex +From: nobody@example.com + +content +**** +# +# no header, multi-sign +exim -DOPT=From:=X-Mine -odf b10@test.ex +From: nobody@example.com + +content +**** +# +# double header, multi-sign +exim -DOPT=From:=X-Mine -odf b12@test.ex +From: nobody@example.com +X-mine: one +X-mine: two + +content +**** +# +# +# no header, always-oversign +exim -DOPT=+X-Mine -odf b20@test.ex +From: nobody@example.com + +content +**** +# +# double header, always-oversign +exim -DOPT=+X-Mine -odf b22@test.ex +From: nobody@example.com +X-mine: one +X-mine: two + +content +**** +# +## default header set +# cannot test that as it includes Date: so results in a varying signature +#exim -DHEADERS_MAXSIZE=y -odf c@test.ex +#From: nobody@example.com +# +#content +#**** +## +# check that on signing we warn in debug mode about verify problems +exim -d-all+acl -DOPT=From -DSELECTOR=sel_bad -odf d@test.ex +From: nobody@example.com + +content +**** +# +# check dkim_strict results in a defer (even with an expansion) +exim -DOPT=From '-DSTRICT=${if ={1}{1}{true}}' '-DTIMES=${bogus}' -odf '-f<>' e0@test.ex +From: nobody@example.com + +content +**** +# +# check that an empty dkim_privatekey overrides dkim_strict +exim -DOPT=From -DSTRICT=true -DSELECTOR=none -odf e@test.ex +From: nobody@example.com + +content +**** +# +# single header signed, body line starting with dot +exim -DOPT=From -odf f@test.ex +From: nobody@example.com + +..content +**** +# +millisleep 500 +killdaemon +no_msglog_check diff --git a/test/scripts/4500-DKIM/4511 b/test/scripts/4500-DKIM/4511 new file mode 100644 index 000000000..3a78b020d --- /dev/null +++ b/test/scripts/4500-DKIM/4511 @@ -0,0 +1,111 @@ +# DKIM signing, with CHUNKING +# +exim -bd -DSERVER=server -oX PORT_S +**** +# +# single header signed, short message +exim -DSRV=dkim -DLIST=From -odf -oMt sender -f sender a@test.ex +From: nobody@example.com +From: second@example.com + +content +**** +# +# single header signed, long message +exim -DSRV=dkim -DLIST=From -odf -oMt sender -f sender b@test.ex +From: nobody@example.com +From: second@example.com + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +The very last line +**** +millisleep 500 +killdaemon +no_msglog_check diff --git a/test/scripts/4500-DKIM/4512 b/test/scripts/4500-DKIM/4512 new file mode 100644 index 000000000..e8924b84e --- /dev/null +++ b/test/scripts/4500-DKIM/4512 @@ -0,0 +1,85 @@ +# DKIM signing, with CHUNKING, smtp/tcp +# +exim -bd -DSERVER=server -oX PORT_S +**** +# +# This should pass. +### sha256, 1024b + message in 1 chunk +# Mail original in aux-fixed/4500.msg2.txt +# Sig generated by: perl aux-fixed/dkim/sign.pl --algorithm=rsa-sha256 \ +# --method=simple/simple < aux-fixed/4500.msg2.txt +client 127.0.0.1 PORT_S +??? 220 +EHLO xxx +??? 250- +??? 250- +??? 250- +??? 250- +??? 250- +??? 250 +MAIL FROM: +??? 250 +RCPT TO: +??? 250 +BDAT 557 LAST +DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=test.ex; h=from:to + :date:message-id:subject; s=sel; bh=ZS4D3qDAC7osugrdWUTQc9HUuaSC + +ScH3/NkwGGOlT0=; b=ncPDYKtCsFuFA7wXHxagsZUh3Rpu0dK6Dl7FbkGykEwU + L/MoAe0D+Aynz+yO0k3d4vGZ6Q2sEJ4MaOZI27ezOSBsBnEhw+0uOaxE6HZew5VD + owfSxfXTkyfJd0CHdtYoXT0OqngTBOtAv87u1T4aLRDY1yAqasVuvLV7V80d4tQ= +From: mrgus@text.ex +To: bakawolf@yahoo.com +Date: Thu, 19 Nov 2015 17:00:07 -0700 +Message-ID: +Subject: simple test + +Line 1: This is a simple test. +Line 2: This is a simple test. +??? 250- 557 +??? 250 +QUIT +??? 221 +**** +# +# This should pass. +### sha256, 1024b + message in 2 chunks +# Mail original in aux-fixed/4500.msg2.txt +# Sig generated by: perl aux-fixed/dkim/sign.pl --algorithm=rsa-sha256 \ +# --method=simple/simple < aux-fixed/4500.msg2.txt +client 127.0.0.1 PORT_S +??? 220 +EHLO xxx +??? 250- +??? 250- +??? 250- +??? 250- +??? 250- +??? 250 +MAIL FROM: +??? 250 +RCPT TO: +??? 250 +BDAT 525 +DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=test.ex; h=from:to + :date:message-id:subject; s=sel; bh=ZS4D3qDAC7osugrdWUTQc9HUuaSC + +ScH3/NkwGGOlT0=; b=ncPDYKtCsFuFA7wXHxagsZUh3Rpu0dK6Dl7FbkGykEwU + L/MoAe0D+Aynz+yO0k3d4vGZ6Q2sEJ4MaOZI27ezOSBsBnEhw+0uOaxE6HZew5VD + owfSxfXTkyfJd0CHdtYoXT0OqngTBOtAv87u1T4aLRDY1yAqasVuvLV7V80d4tQ= +From: mrgus@text.ex +To: bakawolf@yahoo.com +Date: Thu, 19 Nov 2015 17:00:07 -0700 +Message-ID: +Subject: simple test + +Line 1: This is a simple test. +??? 250 525 +BDAT 32 LAST +Line 2: This is a simple test. +??? 250- 32 +??? 250 +QUIT +??? 221 +**** +millisleep 500 +killdaemon +no_msglog_check diff --git a/test/scripts/4500-DKIM/4513 b/test/scripts/4500-DKIM/4513 new file mode 100644 index 000000000..246d0d06b --- /dev/null +++ b/test/scripts/4500-DKIM/4513 @@ -0,0 +1,15 @@ +# DKIM signing, sha512 +# +exim -bd -DSERVER=server -oX PORT_D +**** +# +# default header set +exim -DOPT=+From -DVALUE=sha512 -odf a@test.ex +From: nobody@example.com + +content +**** +# +millisleep 500 +killdaemon +no_msglog_check diff --git a/test/scripts/4500-DKIM/4514 b/test/scripts/4500-DKIM/4514 new file mode 100644 index 000000000..4076f10d5 --- /dev/null +++ b/test/scripts/4500-DKIM/4514 @@ -0,0 +1,14 @@ +# DKIM signing, multiple +# +exim -bd -DSERVER=server -DFAKE=test.dkim.dom.ain -oX PORT_D +**** +# +exim -DSELECTOR=ses:sel -DOPT=From:To:Subject -odf c@test.ex +From: nobody@example.com + +content +**** +# +millisleep 500 +killdaemon +no_msglog_check diff --git a/test/scripts/4500-DKIM/4515 b/test/scripts/4500-DKIM/4515 new file mode 100644 index 000000000..dced4ae46 --- /dev/null +++ b/test/scripts/4500-DKIM/4515 @@ -0,0 +1,54 @@ +# DKIM signing, with transport_filter +# +exim -bd -DSERVER=server -oX PORT_D +**** +# +# baseline (no transport_filter) +exim -DOPT=From -odf a@test.ex +From: nobody@example.com + +content +**** +millisleep 500 +# +# +# with transport_filter +exim -DOPT=From -DFILTER=y -odf b@test.ex +From: nobody@example.com + +content +**** +millisleep 500 +# with transport_filter and CHUNKING +exim -DOPT=From -DFILTER=y -DALLOW=y -odf c@test.ex +From: nobody@example.com + +content +**** +millisleep 500 +# +# for comparison, mails that should get identical sigs, though not using a transport_filter +exim -DOPT=From -odf b@test.ex +From: nobody@example.com + +content + +-- +This is a generic mailinglist footer, using a traditional .sig-separator line +---- +**** +millisleep 500 +exim -DOPT=From -DALLOW=y -odf c@test.ex +From: nobody@example.com + +content + +-- +This is a generic mailinglist footer, using a traditional .sig-separator line +---- +**** +millisleep 500 +# +# +killdaemon +no_msglog_check diff --git a/test/scripts/4500-DKIM/4519 b/test/scripts/4500-DKIM/4519 new file mode 100644 index 000000000..fb98e5564 --- /dev/null +++ b/test/scripts/4500-DKIM/4519 @@ -0,0 +1,68 @@ +# DKIM, CHUNKING, wireformat-spoolfile +# +exim -bd -DSERVER=server -DOPT=dkim -DLIST=Subject -oX PORT_S:PORT_D +**** +# +# 1: non-CHUNKING injection; will not be stored as wireformat therefore +# onward-send will not use sendfile. Should still be signed, and verify correctly. +client 127.0.0.1 PORT_S +??? 220 +EHLO xxx +??? 250- +??? 250- +??? 250- +??? 250- +??? 250- +??? 250 +MAIL FROM: +??? 250 +RCPT TO: +??? 250 +DATA +??? 354 +Subject: simple test + +Line 1: This is a simple test. +Line 2: This is a simple test. +..Line 3 has a leading dot +last line: 4 +. +??? 250 +QUIT +??? 221 +**** +sleep 1 +# +# 2: CHUNKING injection; should be stored as wireformat therefore +# onward-send should not use sendfile. Should still be signed, and verify correctly. +client 127.0.0.1 PORT_S +??? 220 +EHLO xxx +??? 250- +??? 250- +??? 250- +??? 250- +??? 250- +??? 250 +MAIL FROM: +??? 250 +RCPT TO: +??? 250 +BDAT 129 LAST +Subject: simple test + +Line 1: This is a simple test. +Line 2: This is a simple test. +.Line 3 has a leading dot +last line: 4 +??? 250- +??? 250 +QUIT +??? 221 +**** +sleep 1 +# +killdaemon +exim -q +**** +no_msglog_check diff --git a/test/scripts/4500-DKIM/4520 b/test/scripts/4500-DKIM/4520 deleted file mode 100644 index f073be9d3..000000000 --- a/test/scripts/4500-DKIM/4520 +++ /dev/null @@ -1,92 +0,0 @@ -# DKIM signing -# -exim -bd -DSERVER=server -oX PORT_D -**** -# -# single header signed -exim -DOPT=From -odf a@test.ex -From: nobody@example.com -From: second@example.com - -content -**** -# -# single header, oversigned, with timestamps -exim -DOPT=From:From -DTIMES=10 -odf b@test.ex -From: nobody@example.com - -content -**** -# -# no header, multi-sign -exim -DOPT=From:=X-Mine -odf b10@test.ex -From: nobody@example.com - -content -**** -# -# double header, multi-sign -exim -DOPT=From:=X-Mine -odf b12@test.ex -From: nobody@example.com -X-mine: one -X-mine: two - -content -**** -# -# -# no header, always-oversign -exim -DOPT=+X-Mine -odf b20@test.ex -From: nobody@example.com - -content -**** -# -# double header, always-oversign -exim -DOPT=+X-Mine -odf b22@test.ex -From: nobody@example.com -X-mine: one -X-mine: two - -content -**** -# -## default header set -# cannot test that as it includes Date: so results in a varying signature -#exim -DHEADERS_MAXSIZE=y -odf c@test.ex -#From: nobody@example.com -# -#content -#**** -## -# check that on signing we warn in debug mode about verify problems -exim -d-all+acl -DOPT=From -DSELECTOR=sel_bad -odf d@test.ex -From: nobody@example.com - -content -**** -# -# check dkim_strict results in a defer (even with an expansion) -exim -DOPT=From '-DSTRICT=${if ={1}{1}{true}}' '-DTIMES=${bogus}' -odf '-f<>' e0@test.ex -From: nobody@example.com - -content -**** -# -# check that an empty dkim_privatekey overrides dkim_strict -exim -DOPT=From -DSTRICT=true -DSELECTOR=none -odf e@test.ex -From: nobody@example.com - -content -**** -# -# single header signed, body line starting with dot -exim -DOPT=From -odf f@test.ex -From: nobody@example.com - -..content -**** -# -millisleep 500 -killdaemon -no_msglog_check diff --git a/test/scripts/4500-DKIM/4521 b/test/scripts/4500-DKIM/4521 deleted file mode 100644 index 3a78b020d..000000000 --- a/test/scripts/4500-DKIM/4521 +++ /dev/null @@ -1,111 +0,0 @@ -# DKIM signing, with CHUNKING -# -exim -bd -DSERVER=server -oX PORT_S -**** -# -# single header signed, short message -exim -DSRV=dkim -DLIST=From -odf -oMt sender -f sender a@test.ex -From: nobody@example.com -From: second@example.com - -content -**** -# -# single header signed, long message -exim -DSRV=dkim -DLIST=From -odf -oMt sender -f sender b@test.ex -From: nobody@example.com -From: second@example.com - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -The very last line -**** -millisleep 500 -killdaemon -no_msglog_check diff --git a/test/scripts/4500-DKIM/4522 b/test/scripts/4500-DKIM/4522 deleted file mode 100644 index e8924b84e..000000000 --- a/test/scripts/4500-DKIM/4522 +++ /dev/null @@ -1,85 +0,0 @@ -# DKIM signing, with CHUNKING, smtp/tcp -# -exim -bd -DSERVER=server -oX PORT_S -**** -# -# This should pass. -### sha256, 1024b + message in 1 chunk -# Mail original in aux-fixed/4500.msg2.txt -# Sig generated by: perl aux-fixed/dkim/sign.pl --algorithm=rsa-sha256 \ -# --method=simple/simple < aux-fixed/4500.msg2.txt -client 127.0.0.1 PORT_S -??? 220 -EHLO xxx -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -MAIL FROM: -??? 250 -RCPT TO: -??? 250 -BDAT 557 LAST -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=test.ex; h=from:to - :date:message-id:subject; s=sel; bh=ZS4D3qDAC7osugrdWUTQc9HUuaSC - +ScH3/NkwGGOlT0=; b=ncPDYKtCsFuFA7wXHxagsZUh3Rpu0dK6Dl7FbkGykEwU - L/MoAe0D+Aynz+yO0k3d4vGZ6Q2sEJ4MaOZI27ezOSBsBnEhw+0uOaxE6HZew5VD - owfSxfXTkyfJd0CHdtYoXT0OqngTBOtAv87u1T4aLRDY1yAqasVuvLV7V80d4tQ= -From: mrgus@text.ex -To: bakawolf@yahoo.com -Date: Thu, 19 Nov 2015 17:00:07 -0700 -Message-ID: -Subject: simple test - -Line 1: This is a simple test. -Line 2: This is a simple test. -??? 250- 557 -??? 250 -QUIT -??? 221 -**** -# -# This should pass. -### sha256, 1024b + message in 2 chunks -# Mail original in aux-fixed/4500.msg2.txt -# Sig generated by: perl aux-fixed/dkim/sign.pl --algorithm=rsa-sha256 \ -# --method=simple/simple < aux-fixed/4500.msg2.txt -client 127.0.0.1 PORT_S -??? 220 -EHLO xxx -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -MAIL FROM: -??? 250 -RCPT TO: -??? 250 -BDAT 525 -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=test.ex; h=from:to - :date:message-id:subject; s=sel; bh=ZS4D3qDAC7osugrdWUTQc9HUuaSC - +ScH3/NkwGGOlT0=; b=ncPDYKtCsFuFA7wXHxagsZUh3Rpu0dK6Dl7FbkGykEwU - L/MoAe0D+Aynz+yO0k3d4vGZ6Q2sEJ4MaOZI27ezOSBsBnEhw+0uOaxE6HZew5VD - owfSxfXTkyfJd0CHdtYoXT0OqngTBOtAv87u1T4aLRDY1yAqasVuvLV7V80d4tQ= -From: mrgus@text.ex -To: bakawolf@yahoo.com -Date: Thu, 19 Nov 2015 17:00:07 -0700 -Message-ID: -Subject: simple test - -Line 1: This is a simple test. -??? 250 525 -BDAT 32 LAST -Line 2: This is a simple test. -??? 250- 32 -??? 250 -QUIT -??? 221 -**** -millisleep 500 -killdaemon -no_msglog_check diff --git a/test/scripts/4500-DKIM/4523 b/test/scripts/4500-DKIM/4523 deleted file mode 100644 index 246d0d06b..000000000 --- a/test/scripts/4500-DKIM/4523 +++ /dev/null @@ -1,15 +0,0 @@ -# DKIM signing, sha512 -# -exim -bd -DSERVER=server -oX PORT_D -**** -# -# default header set -exim -DOPT=+From -DVALUE=sha512 -odf a@test.ex -From: nobody@example.com - -content -**** -# -millisleep 500 -killdaemon -no_msglog_check diff --git a/test/scripts/4500-DKIM/4524 b/test/scripts/4500-DKIM/4524 deleted file mode 100644 index 4076f10d5..000000000 --- a/test/scripts/4500-DKIM/4524 +++ /dev/null @@ -1,14 +0,0 @@ -# DKIM signing, multiple -# -exim -bd -DSERVER=server -DFAKE=test.dkim.dom.ain -oX PORT_D -**** -# -exim -DSELECTOR=ses:sel -DOPT=From:To:Subject -odf c@test.ex -From: nobody@example.com - -content -**** -# -millisleep 500 -killdaemon -no_msglog_check diff --git a/test/scripts/4500-DKIM/4525 b/test/scripts/4500-DKIM/4525 deleted file mode 100644 index dced4ae46..000000000 --- a/test/scripts/4500-DKIM/4525 +++ /dev/null @@ -1,54 +0,0 @@ -# DKIM signing, with transport_filter -# -exim -bd -DSERVER=server -oX PORT_D -**** -# -# baseline (no transport_filter) -exim -DOPT=From -odf a@test.ex -From: nobody@example.com - -content -**** -millisleep 500 -# -# -# with transport_filter -exim -DOPT=From -DFILTER=y -odf b@test.ex -From: nobody@example.com - -content -**** -millisleep 500 -# with transport_filter and CHUNKING -exim -DOPT=From -DFILTER=y -DALLOW=y -odf c@test.ex -From: nobody@example.com - -content -**** -millisleep 500 -# -# for comparison, mails that should get identical sigs, though not using a transport_filter -exim -DOPT=From -odf b@test.ex -From: nobody@example.com - -content - --- -This is a generic mailinglist footer, using a traditional .sig-separator line ----- -**** -millisleep 500 -exim -DOPT=From -DALLOW=y -odf c@test.ex -From: nobody@example.com - -content - --- -This is a generic mailinglist footer, using a traditional .sig-separator line ----- -**** -millisleep 500 -# -# -killdaemon -no_msglog_check diff --git a/test/scripts/4500-DKIM/4530 b/test/scripts/4500-DKIM/4530 deleted file mode 100644 index fb98e5564..000000000 --- a/test/scripts/4500-DKIM/4530 +++ /dev/null @@ -1,68 +0,0 @@ -# DKIM, CHUNKING, wireformat-spoolfile -# -exim -bd -DSERVER=server -DOPT=dkim -DLIST=Subject -oX PORT_S:PORT_D -**** -# -# 1: non-CHUNKING injection; will not be stored as wireformat therefore -# onward-send will not use sendfile. Should still be signed, and verify correctly. -client 127.0.0.1 PORT_S -??? 220 -EHLO xxx -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -MAIL FROM: -??? 250 -RCPT TO: -??? 250 -DATA -??? 354 -Subject: simple test - -Line 1: This is a simple test. -Line 2: This is a simple test. -..Line 3 has a leading dot -last line: 4 -. -??? 250 -QUIT -??? 221 -**** -sleep 1 -# -# 2: CHUNKING injection; should be stored as wireformat therefore -# onward-send should not use sendfile. Should still be signed, and verify correctly. -client 127.0.0.1 PORT_S -??? 220 -EHLO xxx -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -MAIL FROM: -??? 250 -RCPT TO: -??? 250 -BDAT 129 LAST -Subject: simple test - -Line 1: This is a simple test. -Line 2: This is a simple test. -.Line 3 has a leading dot -last line: 4 -??? 250- -??? 250 -QUIT -??? 221 -**** -sleep 1 -# -killdaemon -exim -q -**** -no_msglog_check diff --git a/test/stderr/4510 b/test/stderr/4510 new file mode 100644 index 000000000..cfdbe6e29 --- /dev/null +++ b/test/stderr/4510 @@ -0,0 +1,64 @@ +Exim version x.yz .... +configuration file is TESTSUITE/test-config +admin user +LOG: MAIN + <= CALLER@myhost.test.ex U=CALLER P=local S=sss +Exim version x.yz .... +configuration file is TESTSUITE/test-config +trusted user +admin user +dropping to exim gid; retaining priv uid +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 +cmd buf flush ddd bytes + 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 +cmd buf flush ddd bytes + SMTP<< 250 OK + SMTP<< 250 Accepted + SMTP<< 354 Enter message, ending with "." on a line by itself +DKIM (checking verify key)>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +DKIM >> Parsing public key record >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + sel_bad._domainkey.test.ex. + Raw record: v=DKIM1\;{SP}p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXRFf+VhT+lCgFhhSkinZKcFNeRzjYdW8vT29Rbb3NadvTFwAd+cVLPFwZL8H5tUD/7JbUPqNTCPxmpgIL+V5T4tEZMorHatvvUM2qfcpQ45IfsZ+YdhbIiAslHCpy4xNxIR3zylgqRUF4+Dtsaqy3a5LhwMiKCLrnzhXk1F1hxwIDAQAB + v=DKIM1\ + p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXRFf+VhT+lCgFhhSkinZKcFNeRzjYdW8vT29Rbb3NadvTFwAd+cVLPFwZL8H5tUD/7JbUPqNTCPxmpgIL+V5T4tEZMorHatvvUM2qfcpQ45IfsZ+YdhbIiAslHCpy4xNxIR3zylgqRUF4+Dtsaqy3a5LhwMiKCLrnzhXk1F1hxwIDAQAB + Bad v= field + Error while parsing public key record +WARNING: bad dkim key in dns +DKIM (finished checking verify key)<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +content{CR}{LF} +DKIM: finish bodyhash 1/1/-1 len 9 +DKIM [test.ex] Body bytes (relaxed) hashed: 9 +DKIM [test.ex] Body sha256 computed: fc06f48221d98ad6106c3845b33a2a41152482ab9e697f736ad26db4853fa657 +DKIM >> Headers to be signed: >>>>>>>>>>>> + From +DKIM >> Header data for hash, canonicalized (relaxed), in sequence >> +from:nobody@example.com{CR}{LF} +DKIM >> Signed DKIM-Signature header, pre-canonicalized >>>>>>>>>>>>> +DKIM-Signature:{SP}v=1;{SP}a=rsa-sha256;{SP}q=dns/txt;{SP}c=relaxed/relaxed;{SP}d=test.ex;{CR}{LF}{TB}s=sel_bad;{SP}h=From;{SP}bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=;{SP}b=; +DKIM >> Signed DKIM-Signature header, canonicalized (relaxed) >>>>>>> +dkim-signature:v=1;{SP}a=rsa-sha256;{SP}q=dns/txt;{SP}c=relaxed/relaxed;{SP}d=test.ex;{SP}s=sel_bad;{SP}h=From;{SP}bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=;{SP}b=; +DKIM [test.ex] Header sha256 computed: 241e16230df5723d899cfae9474c6b376a2ab1f81d1094e358f50ffd0e0067b3 + SMTP+> QUIT +cmd buf flush ddd bytes (more expected) + SMTP(shutdown)>> + SMTP<< 250 OK id=10HmbL-0005vi-00 + SMTP<< 221 myhost.test.ex closing connection + SMTP(close)>> +LOG: MAIN + => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbL-0005vi-00" +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand dkim_timestamps: unknown variable in "${bogus}" + +******** SERVER ******** diff --git a/test/stderr/4511 b/test/stderr/4511 new file mode 100644 index 000000000..045fadc9b --- /dev/null +++ b/test/stderr/4511 @@ -0,0 +1,2 @@ + +******** SERVER ******** diff --git a/test/stderr/4512 b/test/stderr/4512 new file mode 100644 index 000000000..49a0fd875 --- /dev/null +++ b/test/stderr/4512 @@ -0,0 +1,6 @@ +### sha256, 1024b + message in 1 chunk +### sha256, 1024b + message in 2 chunks + +******** SERVER ******** +### sha256, 1024b + message in 1 chunk +### sha256, 1024b + message in 2 chunks diff --git a/test/stderr/4520 b/test/stderr/4520 deleted file mode 100644 index cfdbe6e29..000000000 --- a/test/stderr/4520 +++ /dev/null @@ -1,64 +0,0 @@ -Exim version x.yz .... -configuration file is TESTSUITE/test-config -admin user -LOG: MAIN - <= CALLER@myhost.test.ex U=CALLER P=local S=sss -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -dropping to exim gid; retaining priv uid -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 -cmd buf flush ddd bytes - 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 -cmd buf flush ddd bytes - SMTP<< 250 OK - SMTP<< 250 Accepted - SMTP<< 354 Enter message, ending with "." on a line by itself -DKIM (checking verify key)>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -DKIM >> Parsing public key record >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - sel_bad._domainkey.test.ex. - Raw record: v=DKIM1\;{SP}p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXRFf+VhT+lCgFhhSkinZKcFNeRzjYdW8vT29Rbb3NadvTFwAd+cVLPFwZL8H5tUD/7JbUPqNTCPxmpgIL+V5T4tEZMorHatvvUM2qfcpQ45IfsZ+YdhbIiAslHCpy4xNxIR3zylgqRUF4+Dtsaqy3a5LhwMiKCLrnzhXk1F1hxwIDAQAB - v=DKIM1\ - p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXRFf+VhT+lCgFhhSkinZKcFNeRzjYdW8vT29Rbb3NadvTFwAd+cVLPFwZL8H5tUD/7JbUPqNTCPxmpgIL+V5T4tEZMorHatvvUM2qfcpQ45IfsZ+YdhbIiAslHCpy4xNxIR3zylgqRUF4+Dtsaqy3a5LhwMiKCLrnzhXk1F1hxwIDAQAB - Bad v= field - Error while parsing public key record -WARNING: bad dkim key in dns -DKIM (finished checking verify key)<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -content{CR}{LF} -DKIM: finish bodyhash 1/1/-1 len 9 -DKIM [test.ex] Body bytes (relaxed) hashed: 9 -DKIM [test.ex] Body sha256 computed: fc06f48221d98ad6106c3845b33a2a41152482ab9e697f736ad26db4853fa657 -DKIM >> Headers to be signed: >>>>>>>>>>>> - From -DKIM >> Header data for hash, canonicalized (relaxed), in sequence >> -from:nobody@example.com{CR}{LF} -DKIM >> Signed DKIM-Signature header, pre-canonicalized >>>>>>>>>>>>> -DKIM-Signature:{SP}v=1;{SP}a=rsa-sha256;{SP}q=dns/txt;{SP}c=relaxed/relaxed;{SP}d=test.ex;{CR}{LF}{TB}s=sel_bad;{SP}h=From;{SP}bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=;{SP}b=; -DKIM >> Signed DKIM-Signature header, canonicalized (relaxed) >>>>>>> -dkim-signature:v=1;{SP}a=rsa-sha256;{SP}q=dns/txt;{SP}c=relaxed/relaxed;{SP}d=test.ex;{SP}s=sel_bad;{SP}h=From;{SP}bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=;{SP}b=; -DKIM [test.ex] Header sha256 computed: 241e16230df5723d899cfae9474c6b376a2ab1f81d1094e358f50ffd0e0067b3 - SMTP+> QUIT -cmd buf flush ddd bytes (more expected) - SMTP(shutdown)>> - SMTP<< 250 OK id=10HmbL-0005vi-00 - SMTP<< 221 myhost.test.ex closing connection - SMTP(close)>> -LOG: MAIN - => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbL-0005vi-00" -LOG: MAIN - Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> -1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand dkim_timestamps: unknown variable in "${bogus}" - -******** SERVER ******** diff --git a/test/stderr/4521 b/test/stderr/4521 deleted file mode 100644 index 045fadc9b..000000000 --- a/test/stderr/4521 +++ /dev/null @@ -1,2 +0,0 @@ - -******** SERVER ******** diff --git a/test/stderr/4522 b/test/stderr/4522 deleted file mode 100644 index 49a0fd875..000000000 --- a/test/stderr/4522 +++ /dev/null @@ -1,6 +0,0 @@ -### sha256, 1024b + message in 1 chunk -### sha256, 1024b + message in 2 chunks - -******** SERVER ******** -### sha256, 1024b + message in 1 chunk -### sha256, 1024b + message in 2 chunks diff --git a/test/stdout/4512 b/test/stdout/4512 new file mode 100644 index 000000000..0067c9ff0 --- /dev/null +++ b/test/stdout/4512 @@ -0,0 +1,97 @@ +### sha256, 1024b + message in 1 chunk +Connecting to 127.0.0.1 port 1224 ... connected +??? 220 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO xxx +??? 250- +<<< 250-testhost.test.ex Hello xxx [127.0.0.1] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-8BITMIME +??? 250- +<<< 250-PIPELINING +??? 250- +<<< 250-CHUNKING +??? 250 +<<< 250 HELP +>>> MAIL FROM: +??? 250 +<<< 250 OK +>>> RCPT TO: +??? 250 +<<< 250 Accepted +>>> BDAT 557 LAST +>>> DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=test.ex; h=from:to +>>> :date:message-id:subject; s=sel; bh=ZS4D3qDAC7osugrdWUTQc9HUuaSC +>>> +ScH3/NkwGGOlT0=; b=ncPDYKtCsFuFA7wXHxagsZUh3Rpu0dK6Dl7FbkGykEwU +>>> L/MoAe0D+Aynz+yO0k3d4vGZ6Q2sEJ4MaOZI27ezOSBsBnEhw+0uOaxE6HZew5VD +>>> owfSxfXTkyfJd0CHdtYoXT0OqngTBOtAv87u1T4aLRDY1yAqasVuvLV7V80d4tQ= +>>> From: mrgus@text.ex +>>> To: bakawolf@yahoo.com +>>> Date: Tue, 2 Mar 1999 09:44:33 +0000 +>>> Message-ID: +>>> Subject: simple test +>>> +>>> Line 1: This is a simple test. +>>> Line 2: This is a simple test. +??? 250- 557 +<<< 250- 557 byte chunk, total 557 +??? 250 +<<< 250 OK id=10HmaX-0005vi-00 +>>> QUIT +??? 221 +<<< 221 testhost.test.ex closing connection +End of script +### sha256, 1024b + message in 2 chunks +Connecting to 127.0.0.1 port 1224 ... connected +??? 220 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO xxx +??? 250- +<<< 250-testhost.test.ex Hello xxx [127.0.0.1] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-8BITMIME +??? 250- +<<< 250-PIPELINING +??? 250- +<<< 250-CHUNKING +??? 250 +<<< 250 HELP +>>> MAIL FROM: +??? 250 +<<< 250 OK +>>> RCPT TO: +??? 250 +<<< 250 Accepted +>>> BDAT 525 +>>> DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=test.ex; h=from:to +>>> :date:message-id:subject; s=sel; bh=ZS4D3qDAC7osugrdWUTQc9HUuaSC +>>> +ScH3/NkwGGOlT0=; b=ncPDYKtCsFuFA7wXHxagsZUh3Rpu0dK6Dl7FbkGykEwU +>>> L/MoAe0D+Aynz+yO0k3d4vGZ6Q2sEJ4MaOZI27ezOSBsBnEhw+0uOaxE6HZew5VD +>>> owfSxfXTkyfJd0CHdtYoXT0OqngTBOtAv87u1T4aLRDY1yAqasVuvLV7V80d4tQ= +>>> From: mrgus@text.ex +>>> To: bakawolf@yahoo.com +>>> Date: Tue, 2 Mar 1999 09:44:33 +0000 +>>> Message-ID: +>>> Subject: simple test +>>> +>>> Line 1: This is a simple test. +??? 250 525 +<<< 250 525 byte chunk received +>>> BDAT 32 LAST +>>> Line 2: This is a simple test. +??? 250- 32 +<<< 250- 32 byte chunk, total 557 +??? 250 +<<< 250 OK id=10HmaY-0005vi-00 +>>> QUIT +??? 221 +<<< 221 testhost.test.ex closing connection +End of script + +******** SERVER ******** +### sha256, 1024b + message in 1 chunk +### sha256, 1024b + message in 2 chunks diff --git a/test/stdout/4519 b/test/stdout/4519 new file mode 100644 index 000000000..9d64ae5f5 --- /dev/null +++ b/test/stdout/4519 @@ -0,0 +1,75 @@ +Connecting to 127.0.0.1 port 1224 ... connected +??? 220 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO xxx +??? 250- +<<< 250-testhost.test.ex Hello xxx [127.0.0.1] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-8BITMIME +??? 250- +<<< 250-PIPELINING +??? 250- +<<< 250-CHUNKING +??? 250 +<<< 250 HELP +>>> MAIL FROM: +??? 250 +<<< 250 OK +>>> RCPT TO: +??? 250 +<<< 250 Accepted +>>> DATA +??? 354 +<<< 354 Enter message, ending with "." on a line by itself +>>> Subject: simple test +>>> +>>> Line 1: This is a simple test. +>>> Line 2: This is a simple test. +>>> ..Line 3 has a leading dot +>>> last line: 4 +>>> . +??? 250 +<<< 250 OK id=10HmaZ-0005vi-00 +>>> QUIT +??? 221 +<<< 221 testhost.test.ex closing connection +End of script +Connecting to 127.0.0.1 port 1224 ... connected +??? 220 +<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO xxx +??? 250- +<<< 250-testhost.test.ex Hello xxx [127.0.0.1] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-8BITMIME +??? 250- +<<< 250-PIPELINING +??? 250- +<<< 250-CHUNKING +??? 250 +<<< 250 HELP +>>> MAIL FROM: +??? 250 +<<< 250 OK +>>> RCPT TO: +??? 250 +<<< 250 Accepted +>>> BDAT 129 LAST +>>> Subject: simple test +>>> +>>> Line 1: This is a simple test. +>>> Line 2: This is a simple test. +>>> .Line 3 has a leading dot +>>> last line: 4 +??? 250- +<<< 250- 129 byte chunk, total 129 +??? 250 +<<< 250 OK id=10HmbA-0005vi-00 +>>> QUIT +??? 221 +<<< 221 testhost.test.ex closing connection +End of script -- cgit v1.2.3