Gitweb:
https://git.exim.org/exim.git/commitdiff/6bacc7090a4d219a48899c5b5b08b33f4811dc7f
Commit: 6bacc7090a4d219a48899c5b5b08b33f4811dc7f
Parent: 2d432dfd22141f9933cac8ab3e26a8babaf87bef
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Oct 11 12:42:20 2020 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun Oct 11 13:31:44 2020 +0100
Testsuite: case-number shuffling
---
.../{0622.bounce.tmpl => 0608.bounce.tmpl} | 0
test/aux-fixed/{0623.list => 0618.list} | 0
test/aux-fixed/{0625.lsearch => 0620.lsearch} | 0
test/confs/0583 | 54 +-
test/confs/0584 | 25 +-
test/confs/0585 | 27 +-
test/confs/0586 | 13 +-
test/confs/0587 | 31 +-
test/confs/0588 | 37 +-
test/confs/0589 | 50 +-
test/confs/0591 | 33 -
test/confs/{0584 => 0593} | 2 +-
test/confs/{0585 => 0594} | 2 +-
test/confs/{0586 => 0595} | 2 +-
test/confs/{0587 => 0596} | 2 +-
test/confs/{0599 => 0597} | 2 +-
test/confs/{0621 => 0598} | 2 +-
test/confs/0599 | 60 +-
test/confs/0601 | 23 +-
test/confs/0603 | 46 +-
test/confs/0604 | 58 +-
test/confs/0605 | 11 +-
test/confs/0606 | 63 +-
test/confs/0608 | 41 +-
test/confs/0612 | 81 ++-
test/confs/0614 | 52 +-
test/confs/0615 | 60 +-
test/confs/0618 | 83 +--
test/confs/0619 | 32 +-
test/confs/0620 | 69 +-
test/confs/0622 | 49 --
test/confs/0623 | 23 -
test/confs/0624 | 24 -
test/confs/0625 | 1 -
test/log/0583 | 23 +-
test/log/0585 | 8 +-
test/log/{0608 => 0586} | 0
test/log/0588 | 15 -
test/log/0589 | 26 +-
test/log/{0584 => 0593} | 0
test/log/{0585 => 0594} | 0
test/log/{0587 => 0596} | 0
test/log/{0599 => 0597} | 0
test/log/{0621 => 0598} | 0
test/log/0599 | 49 +-
test/log/0601 | 70 +-
test/log/0603 | 32 +-
test/log/0604 | 339 +--------
test/log/{0614 => 0605} | 0
test/log/{0620 => 0606} | 0
test/log/0608 | 77 ++-
test/log/0612 | 107 ++-
test/log/0614 | 28 +-
test/log/0615 | 393 +++++++++--
test/log/0618 | 104 +--
test/log/0619 | 29 +-
test/log/0620 | 9 +-
test/log/0622 | 74 --
test/log/0623 | 6 -
test/log/0624 | 19 -
test/log/0625 | 6 -
test/mail/{0620.b => 0606.b} | 0
.../{0622.bounce_message => 0608.bounce_message} | 0
test/mail/{0618.rmt_accept => 0612.rmt_accept} | 0
test/msglog/0593.10HmaX-0005vi-00 | 2 +
test/msglog/0594.10HmaX-0005vi-00 | 2 +
test/paniclog/{0584 => 0593} | 0
test/paniclog/{0585 => 0594} | 0
test/paniclog/{0622 => 0608} | 6 +-
test/rejectlog/0583 | 42 +-
test/rejectlog/{0583 => 0585} | 0
test/rejectlog/0589 | 6 -
test/rejectlog/{0618 => 0612} | 0
test/rejectlog/0619 | 1 +
test/scripts/0000-Basic/0583 | 103 ++-
test/scripts/0000-Basic/0584 | 31 +-
test/scripts/0000-Basic/0585 | 67 +-
test/scripts/0000-Basic/0586 | 22 +-
test/scripts/0000-Basic/0587 | 24 +-
test/scripts/0000-Basic/0588 | 56 +-
test/scripts/0000-Basic/0589 | 57 +-
test/scripts/0000-Basic/0591 | 29 -
test/scripts/0000-Basic/{0584 => 0593} | 0
test/scripts/0000-Basic/{0585 => 0594} | 0
test/scripts/0000-Basic/{0586 => 0595} | 0
test/scripts/0000-Basic/{0587 => 0596} | 0
test/scripts/0000-Basic/{0599 => 0597} | 0
test/scripts/0000-Basic/{0621 => 0598} | 0
test/scripts/0000-Basic/0599 | 79 +--
test/scripts/0000-Basic/0601 | 114 +++-
test/scripts/0000-Basic/0603 | 71 +-
test/scripts/0000-Basic/0604 | 692 +------------------
test/scripts/0000-Basic/0605 | 22 +-
test/scripts/0000-Basic/0606 | 23 +-
test/scripts/0000-Basic/0608 | 55 +-
test/scripts/0000-Basic/0612 | 180 ++++-
test/scripts/0000-Basic/0614 | 74 +-
test/scripts/0000-Basic/0615 | 756 ++++++++++++++++++---
test/scripts/0000-Basic/0618 | 171 +----
test/scripts/0000-Basic/0619 | 90 ++-
test/scripts/0000-Basic/0620 | 22 +-
test/scripts/0000-Basic/0622 | 49 --
test/scripts/0000-Basic/0623 | 57 --
test/scripts/0000-Basic/0624 | 69 --
test/scripts/0000-Basic/0625 | 18 -
test/stderr/0583 | 12 -
test/stderr/0584 | 68 +-
test/stderr/0585 | 13 +-
test/stderr/{0605 => 0587} | 0
test/stderr/{0606 => 0588} | 0
test/stderr/0591 | 67 --
test/{paniclog/0584 => stderr/0593} | 0
test/{paniclog/0585 => stderr/0594} | 0
test/stderr/{0615 => 0601} | 0
test/stderr/0604 | 2 -
test/stderr/{0622 => 0608} | 6 +-
test/stderr/0615 | 66 +-
test/stderr/{0623 => 0618} | 16 +-
test/stderr/{0625 => 0620} | 0
test/stdout/0583 | 113 +--
test/stdout/0584 | 37 +-
test/stdout/{0583 => 0585} | 0
test/stdout/0586 | 16 +-
test/stdout/0587 | 18 +-
test/stdout/0588 | 60 +-
test/stdout/0589 | 75 +-
test/stdout/0591 | 39 --
test/stdout/{0584 => 0593} | 0
test/stdout/{0586 => 0595} | 2 +-
test/stdout/{0587 => 0596} | 0
test/stdout/{0599 => 0597} | 0
test/stdout/0599 | 81 +--
test/stdout/0601 | 7 -
test/stdout/0603 | 31 -
test/stdout/0605 | 20 +-
test/stdout/0606 | 20 -
test/stdout/0608 | 14 -
test/stdout/{0618 => 0612} | 0
test/stdout/0614 | 41 +-
test/stdout/{0604 => 0615} | 0
test/stdout/0618 | 176 ++---
test/stdout/{0624 => 0619} | 0
test/stdout/{0625 => 0620} | 0
test/stdout/0623 | 65 --
144 files changed, 2884 insertions(+), 3643 deletions(-)
diff --git a/test/aux-fixed/0622.bounce.tmpl b/test/aux-fixed/0608.bounce.tmpl
similarity index 100%
rename from test/aux-fixed/0622.bounce.tmpl
rename to test/aux-fixed/0608.bounce.tmpl
diff --git a/test/aux-fixed/0623.list b/test/aux-fixed/0618.list
similarity index 100%
rename from test/aux-fixed/0623.list
rename to test/aux-fixed/0618.list
diff --git a/test/aux-fixed/0625.lsearch b/test/aux-fixed/0620.lsearch
similarity index 100%
rename from test/aux-fixed/0625.lsearch
rename to test/aux-fixed/0620.lsearch
diff --git a/test/confs/0583 b/test/confs/0583
index ae5b55d..9a32916 100644
--- a/test/confs/0583
+++ b/test/confs/0583
@@ -1,24 +1,60 @@
# Exim test configuration 0583
-ERROR_DETAILS=
-
.include DIR/aux-var/std_conf_prefix
primary_hostname = myhost.test.ex
# ----- Main settings -----
-acl_smtp_rcpt = accept
-acl_smtp_data = check_data
-
-ERROR_DETAILS
+acl_smtp_rcpt = chk_rcpt
+log_selector = +millisec
-# ----- ACL ------
+# --- ACL ---
begin acl
-check_data:
- accept verify = not_blind/case_insensitive
+chk_rcpt:
+ deny !verify = recipient/quota=cachepos=20s,cacheneg=100s
+ logwrite = where='$recipient_verify_failure' msg='$acl_verify_message'
+ accept
+
+loggit:
+ accept logwrite = $acl_arg1 was called for $local_part@$domain
+ message = /
+
+# ----- Routers -----
+
+begin routers
+
+localuser:
+ driver = accept
+ local_parts = !route_fail
+ transport = appendfile
+ # set address_data purely to get logging of use of the router
+ address_data = ${acl {loggit}{router }}
+
+failrouter:
+ driver = accept
+ condition = ${if eq {${acl {loggit}{router }}}{} {no}{no}}
+ transport = appendfile
+
+# ----- Transports -----
+
+begin transports
+
+appendfile:
+ driver = appendfile
+ file = DIR/test-mail/themailfile
+ quota = 1k
+ user = CALLER
+ # set homedir purely to get logging of use of the transport
+ home_directory = ${acl {loggit}{transport}}
+
+# ----- Retry -----
+
+begin retry
+
+* * F,5d,1d
# End
diff --git a/test/confs/0584 b/test/confs/0584
index 654ecbf..868a5e4 100644
--- a/test/confs/0584
+++ b/test/confs/0584
@@ -1,14 +1,15 @@
-# Exim test configuration 0005
+# Exim test configuration 0584
.include DIR/aux-var/std_conf_prefix
+primary_hostname = myhost.test.ex
# ----- Main settings -----
-domainlist local_domains = @
+domainlist local_domains = test.ex
acl_smtp_rcpt = check_recipient
-trusted_users = CALLER
+queue_only
# ----- ACL -----
@@ -16,25 +17,17 @@ trusted_users = CALLER
begin acl
check_recipient:
- accept hosts = :
- accept domains = +local_domains
- deny message = relay not permitted
+ require verify = sender=OPT
+ accept
# ----- Routers -----
begin routers
-localuser:
+goodroute:
driver = accept
- check_local_user
- transport = local_delivery
+ local_parts = userx
+ verify_only
-# ----- Transports -----
-
-begin transports
-
-local_delivery:
- driver = appendfile
- file = DIR/test-mail/$local_part
# End
diff --git a/test/confs/0585 b/test/confs/0585
index a0b35e7..9bf8fc7 100644
--- a/test/confs/0585
+++ b/test/confs/0585
@@ -1,33 +1,24 @@
# Exim test configuration 0585
+ERROR_DETAILS=
+
.include DIR/aux-var/std_conf_prefix
primary_hostname = myhost.test.ex
# ----- Main settings -----
+acl_smtp_rcpt = accept
+acl_smtp_data = check_data
+ERROR_DETAILS
-# ----- Routers -----
-
-begin routers
-
-r2:
- driver = redirect
- local_part_prefix = pipe-
- local_part_suffix = =*
- caseful_local_part = true
- data = |${substr_1:$local_part_suffix}
- pipe_transport = t2
-
+# ----- ACL ------
-# ----- Transports -----
+begin acl
-begin transports
+check_data:
+ accept verify = not_blind/case_insensitive
-t2:
- driver = pipe
- user = CALLER
- batch_max = 10
# End
diff --git a/test/confs/0586 b/test/confs/0586
index 1b2d835..562837b 100644
--- a/test/confs/0586
+++ b/test/confs/0586
@@ -2,16 +2,19 @@
.include DIR/aux-var/std_conf_prefix
+primary_hostname = myhost.test.ex
# ----- Main settings -----
+acl_smtp_helo = check_helo
-# ----- Routers -----
-begin routers
+# ----- ACLs -----
-list:
- driver = redirect
- file = DIR/aux-fixed/TESTNUM.list.$local_part
+begin acl
+
+check_helo:
+ require verify = helo
+ accept logwrite = helo $sender_helo_name dnssec <$sender_helo_dnssec>
# End
diff --git a/test/confs/0587 b/test/confs/0587
index c54c63f..aff8208 100644
--- a/test/confs/0587
+++ b/test/confs/0587
@@ -2,36 +2,13 @@
.include DIR/aux-var/std_conf_prefix
-
# ----- Main settings -----
-domainlist local_domains = @
-
-acl_smtp_rcpt = accept
-trusted_users = CALLER
-
-
-# ----- Routers -----
-
-begin routers
+disable_ipv6 = true
-dump_remote_domains:
- driver = redirect
- domains = ! +local_domains
- data = :blackhole:
+acl_smtp_rcpt = accept hosts = test.again.dns
-localuser:
- driver = accept
- check_local_user
- transport = local_delivery
-
-
-# ----- Transports -----
-
-begin transports
-
-local_delivery:
- driver = appendfile
- file = DIR/test-mail/$local_part_data
+queue_only
# End
+
diff --git a/test/confs/0588 b/test/confs/0588
index 9a88c9c..314243f 100644
--- a/test/confs/0588
+++ b/test/confs/0588
@@ -2,41 +2,18 @@
.include DIR/aux-var/std_conf_prefix
-log_selector = +received_recipients +sender_on_delivery +millisec
+slow_lookup_log = 1000
-# ----- Main settings -----
+acl_smtp_rcpt = accept verify = recipient
-acl_smtp_rcpt = accept
-
-# ----- Routers -----
+queue_only
begin routers
-rx_dump:
- driver = redirect
- condition = ${if !eq {$received_ip_address}{127.0.0.1}}
- data = :blackhole:
-
-smtp_try:
- driver = accept
- transport = send_to_server
-
-# ----- Transports -----
-
-begin transports
-
-send_to_server:
- driver = smtp
- hosts = HOSTIPV4
- allow_localhost
- port = PORT_D
- hosts_try_fastopen = :
-
-# ----- Retry -----
-
-begin retry
-
-* * F,5d,10s
+all:
+ driver = dnslookup
+ verify_only
+ self = send
# End
diff --git a/test/confs/0589 b/test/confs/0589
index b0f7311..080d931 100644
--- a/test/confs/0589
+++ b/test/confs/0589
@@ -2,59 +2,41 @@
.include DIR/aux-var/std_conf_prefix
-primary_hostname = myhost.test.ex
+log_selector = +received_recipients +sender_on_delivery +millisec
# ----- Main settings -----
-acl_smtp_rcpt = chk_rcpt
-log_selector = +millisec
-
-# --- ACL ---
-
-begin acl
-
-chk_rcpt:
- deny !verify = recipient/quota=cachepos=20s,cacheneg=100s
- logwrite = where='$recipient_verify_failure' msg='$acl_verify_message'
- accept
-
-loggit:
- accept logwrite = $acl_arg1 was called for $local_part@$domain
- message = /
+acl_smtp_rcpt = accept
# ----- Routers -----
begin routers
-localuser:
- driver = accept
- local_parts = !route_fail
- transport = appendfile
- # set address_data purely to get logging of use of the router
- address_data = ${acl {loggit}{router }}
+rx_dump:
+ driver = redirect
+ condition = ${if !eq {$received_ip_address}{127.0.0.1}}
+ data = :blackhole:
-failrouter:
+smtp_try:
driver = accept
- condition = ${if eq {${acl {loggit}{router }}}{} {no}{no}}
- transport = appendfile
+ transport = send_to_server
# ----- Transports -----
begin transports
-appendfile:
- driver = appendfile
- file = DIR/test-mail/themailfile
- quota = 1k
- user = CALLER
- # set homedir purely to get logging of use of the transport
- home_directory = ${acl {loggit}{transport}}
+send_to_server:
+ driver = smtp
+ hosts = HOSTIPV4
+ allow_localhost
+ port = PORT_D
+ hosts_try_fastopen = :
# ----- Retry -----
begin retry
-* * F,5d,1d
-
+* * F,5d,10s
# End
+
diff --git a/test/confs/0591 b/test/confs/0591
deleted file mode 100644
index 8eaeb08..0000000
--- a/test/confs/0591
+++ /dev/null
@@ -1,33 +0,0 @@
-# Exim test configuration 0591
-
-.include DIR/aux-var/std_conf_prefix
-
-primary_hostname = myhost.test.ex
-
-# ----- Main settings -----
-
-domainlist local_domains = test.ex
-
-acl_smtp_rcpt = check_recipient
-queue_only
-
-
-# ----- ACL -----
-
-begin acl
-
-check_recipient:
- require verify = sender=OPT
- accept
-
-# ----- Routers -----
-
-begin routers
-
-goodroute:
- driver = accept
- local_parts = userx
- verify_only
-
-
-# End
diff --git a/test/confs/0584 b/test/confs/0593
similarity index 94%
copy from test/confs/0584
copy to test/confs/0593
index 654ecbf..439374e 100644
--- a/test/confs/0584
+++ b/test/confs/0593
@@ -1,4 +1,4 @@
-# Exim test configuration 0005
+# Exim test configuration 0593
.include DIR/aux-var/std_conf_prefix
diff --git a/test/confs/0585 b/test/confs/0594
similarity index 93%
copy from test/confs/0585
copy to test/confs/0594
index a0b35e7..9812612 100644
--- a/test/confs/0585
+++ b/test/confs/0594
@@ -1,4 +1,4 @@
-# Exim test configuration 0585
+# Exim test configuration 0594
.include DIR/aux-var/std_conf_prefix
diff --git a/test/confs/0586 b/test/confs/0595
similarity index 85%
copy from test/confs/0586
copy to test/confs/0595
index 1b2d835..2aa247f 100644
--- a/test/confs/0586
+++ b/test/confs/0595
@@ -1,4 +1,4 @@
-# Exim test configuration 0586
+# Exim test configuration 0595
.include DIR/aux-var/std_conf_prefix
diff --git a/test/confs/0587 b/test/confs/0596
similarity index 93%
copy from test/confs/0587
copy to test/confs/0596
index c54c63f..bea9e95 100644
--- a/test/confs/0587
+++ b/test/confs/0596
@@ -1,4 +1,4 @@
-# Exim test configuration 0587
+# Exim test configuration 0596
.include DIR/aux-var/std_conf_prefix
diff --git a/test/confs/0599 b/test/confs/0597
similarity index 96%
copy from test/confs/0599
copy to test/confs/0597
index efdbd3c..dcebf15 100644
--- a/test/confs/0599
+++ b/test/confs/0597
@@ -1,4 +1,4 @@
-# Exim test configuration 0599
+# Exim test configuration 0597
# control = queue/first_pass_route
.include DIR/aux-var/std_conf_prefix
diff --git a/test/confs/0621 b/test/confs/0598
similarity index 90%
rename from test/confs/0621
rename to test/confs/0598
index ef3427d..5e7184d 100644
--- a/test/confs/0621
+++ b/test/confs/0598
@@ -1,4 +1,4 @@
-# Exim test configuration 0621
+# Exim test configuration 0598
.include DIR/aux-var/std_conf_prefix
diff --git a/test/confs/0599 b/test/confs/0599
index efdbd3c..ef2ea78 100644
--- a/test/confs/0599
+++ b/test/confs/0599
@@ -1,55 +1,19 @@
# Exim test configuration 0599
-# control = queue/first_pass_route
-
-.include DIR/aux-var/std_conf_prefix
-
+# udpsend
+
+exim_path = EXIM_PATH
+keep_environment =
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+tls_advertise_hosts =
+queue_only
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
# ----- Main settings -----
-domainlist local_domains = @
-
-acl_smtp_rcpt = check_rcpt
-
-trusted_users = CALLER
-queue_run_in_order
-
-
-# ----- ACL -----
-
-begin acl
-
-check_rcpt:
- accept senders = HOSTIPV4
-
- accept local_parts = ^queue_only.*
- control = queue_only
-
- accept local_parts = ^first_pass_route.*
- control = queue/first_pass_route
-
-# ----- Routers -----
-
-begin routers
-
-discard_remote_source:
- driver = redirect
- condition = ${if !eq {$sender_host_address}{127.0.0.1}}
- data = :blackhole:
-
-outbound:
- driver = accept
- transport = smtp
-
-
-# ----- Transports -----
-
-begin transports
+acl_smtp_rcpt = accept udpsend = <; 127.0.0.1 ; 1223 ; message from exim
-smtp:
- driver = smtp
- hosts = HOSTIPV4
- port = PORT_D
- allow_localhost
- hosts_try_fastopen = :
# End
diff --git a/test/confs/0601 b/test/confs/0601
index 8b47f3d..d9f37ba 100644
--- a/test/confs/0601
+++ b/test/confs/0601
@@ -1,19 +1,32 @@
# Exim test configuration 0601
-# udpsend
+keep_environment = PATH
exim_path = EXIM_PATH
-keep_environment =
spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
+
+log_file_path = DIR/spool/log/%slog : syslog
+
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+chunking_advertise_hosts =
tls_advertise_hosts =
-queue_only
+
.ifdef _HAVE_DMARC
dmarc_tld_file =
.endif
+primary_hostname = myhost.test.ex
+queue_only
+
# ----- Main settings -----
-acl_smtp_rcpt = accept udpsend = <; 127.0.0.1 ; 1223 ; message from exim
+log_selector = LOG_SELECTOR
+log_timezone = TIMES
+
+syslog_timestamp = ARG1
+syslog_pid = ARG2
+
+acl_not_smtp = accept logwrite = msg
# End
diff --git a/test/confs/0603 b/test/confs/0603
index eaf6a6b..7e52e00 100644
--- a/test/confs/0603
+++ b/test/confs/0603
@@ -1,57 +1,41 @@
# Exim test configuration 0603
-# Add several messages going to the same location
-# And change smtp output based on senders domain
-
-hostlist loopback = <; 127.0.0.0/8 ; 0.0.0.0 ; ::1 ; 0000:0000:0000:0000:0000:ffff
-untrusted_set_sender = *
-
-SERVER =
+# log_defer_output on pipe transport
.include DIR/aux-var/std_conf_prefix
-rfc1413_query_timeout = 0s
-log_selector = +sender_on_delivery
+primary_hostname = myhost.test.ex
# ----- Main settings -----
-acl_smtp_rcpt = accept
+log_selector = +received_recipients
-queue_only
-queue_run_in_order
+#acl_smtp_rcpt = accept
# ----- Routers -----
begin routers
client:
- driver = accept
- condition = ${if eq {SERVER}{server}{no}{yes}}
- transport = send_to_server
-
-server:
- driver = accept
- transport = send_to_server
-
+ driver = accept
+ transport = pipe
# ----- Transports -----
begin transports
-send_to_server:
- driver = smtp
- connection_max_messages = 0
- allow_localhost
- hosts = 127.0.0.1
- port = PORT_D
- hosts_try_fastopen = :
- # assumes that HOSTIPV4 can send to 127.0.0.1
- interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
+pipe:
+ driver = pipe
+ temp_errors = *
+ command = perl -e "print 'Hi from pipe'; exit 5;"
+ log_defer_output = true
+ path = ${env{PATH}}
# ----- Retry -----
+
begin retry
-* * F,5d,10s
+* * F,1h,10m
-# End
+# End
diff --git a/test/confs/0604 b/test/confs/0604
index 13ad0c2..72772ab 100644
--- a/test/confs/0604
+++ b/test/confs/0604
@@ -1,56 +1,30 @@
# Exim test configuration 0604
-# Send many messages in hopes of tripping continuation records code
-hostlist loopback = <; 127.0.0.0/8 ; 0.0.0.0 ; ::1 ; 0000:0000:0000:0000:0000:ffff
-untrusted_set_sender = *
+LOG_SELECTOR=
-SERVER =
+keep_environment = PATH
+exim_path = EXIM_PATH
+spool_directory = DIR/spool
-.include DIR/aux-var/std_conf_prefix
+log_file_path = DIR/spool/log/%slog
-rfc1413_query_timeout = 0s
-log_selector = +sender_on_delivery +millisec
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+chunking_advertise_hosts =
+tls_advertise_hosts =
-# ----- Main settings -----
-
-acl_smtp_rcpt = accept
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+primary_hostname = myhost.test.ex
queue_only
-queue_run_in_order
-
-# ----- Routers -----
-
-begin routers
-
-client:
- driver = accept
- condition = ${if eq {SERVER}{server}{no}{yes}}
- transport = send_to_server
-
-server:
- driver = accept
- transport = send_to_server
+# ----- Main settings -----
-# ----- Transports -----
-
-begin transports
-
-send_to_server:
- driver = smtp
- connection_max_messages = 0
- allow_localhost
- hosts = 127.0.0.1
- port = PORT_D
- hosts_try_fastopen = :
- # assumes that HOSTIPV4 can sent to 127.0.0.1
- interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
-
-# ----- Retry -----
+log_selector = LOG_SELECTOR
-begin retry
+acl_not_smtp = accept
-* * F,5d,10s
# End
-
diff --git a/test/confs/0605 b/test/confs/0605
index 2b5185c..c3d6d51 100644
--- a/test/confs/0605
+++ b/test/confs/0605
@@ -1,14 +1,15 @@
# Exim test configuration 0605
+# hosts_connection_nolog versus sender_host lists caching
.include DIR/aux-var/std_conf_prefix
-# ----- Main settings -----
-
-disable_ipv6 = true
+primary_hostname = myhost.test.ex
-acl_smtp_rcpt = accept hosts = test.again.dns
+# ----- Main settings -----
+log_selector = +smtp_connection
+hostlist nolog = 127.0.0.1
+hosts_connection_nolog = +nolog
queue_only
# End
-
diff --git a/test/confs/0606 b/test/confs/0606
index 2570697..d78b8ba 100644
--- a/test/confs/0606
+++ b/test/confs/0606
@@ -2,18 +2,67 @@
.include DIR/aux-var/std_conf_prefix
-slow_lookup_log = 1000
-acl_smtp_rcpt = accept verify = recipient
+# ----- Main settings -----
-queue_only
+domainlist local_domains = test.ex
+qualify_domain = test.ex
+
+acl_not_smtp = not_smtp
+
+begin acl
+
+not_smtp:
+ accept log_message = rcpts <$recipients> local_part <$local_part>
+
+# ----- Routers -----
begin routers
-all:
- driver = dnslookup
+hide_verifies:
+ driver = accept
verify_only
- self = send
-# End
+alias:
+ driver = redirect
+ debug_print = DEBUG: $r_r1 $r_r2
+ data = b
+ # r_r1 checks that a variable with tainted data is ok
+ # that the default list-sep ":" is not used for this list
+ # that an '=' on the RHS is ok
+ set = r_r1 = <$local_part> aaa:bbb bar=baz
+ # r_local checks that a variable is immediately usable
+ set = r_local = check
+ errors_to = bad_$r_local
+
+user:
+ driver = accept
+ debug_print = DEBUG: $r_r1 $r_r2
+ # r_r1 vs. r_r2 checks we can have multiple "set" options
+ set = r_r1 = $local_part
+ set = r_r2 = $local_part \
+ 2a00:1940:100::ff:0:1 \
+ foo=bar \
+ # check we can get a newline into content
+ newline=initial\n\tcont \
+ # check we can get a list-sep into content (by doubling)
+ semicolon=initial;;cont \
+ ; \
+ # r_r3 checks we can have a list as arg for a "set" option
+ r_r3 = bletch
+ transport = local_delivery
+
+# ----- Transports -----
+
+begin transports
+
+local_delivery:
+ driver = appendfile
+ envelope_to_add
+ file = DIR/test-mail/${bless:$local_part}
+ user = CALLER
+ headers_add = X-r1: <$r_r1>\nX-r2: <$r_r2>\nX-r3: <$r_r3>
+
+
+# End
diff --git a/test/confs/0608 b/test/confs/0608
index 0ca40c7..a2ec1be 100644
--- a/test/confs/0608
+++ b/test/confs/0608
@@ -1,4 +1,5 @@
# Exim test configuration 0608
+# Bounces
.include DIR/aux-var/std_conf_prefix
@@ -6,15 +7,43 @@ primary_hostname = myhost.test.ex
# ----- Main settings -----
-acl_smtp_helo = check_helo
+acl_smtp_rcpt = accept
+log_selector = +received_recipients +millisec
+.ifdef OPT
+bounce_message_file = OPT
+warn_message_file = OPT
+.endif
-# ----- ACLs -----
+delay_warning = 1s
-begin acl
+# ----- Routers -----
+
+begin routers
+
+delay:
+ driver = redirect
+ local_parts = ^delay
+ allow_defer
+ data = :defer: deliberate for test purposes
+
+bounces:
+ driver = accept
+ condition = ${if !def:sender_address}
+ transport = savebounce
+
+begin transports
+
+savebounce:
+ driver = appendfile
+ file = DIR/test-mail/bounce_message
+ user = CALLER
+
+# ----- Retry -----
+
+begin retry
+
+* * F,5d,100s
-check_helo:
- require verify = helo
- accept logwrite = helo $sender_helo_name dnssec <$sender_helo_dnssec>
# End
diff --git a/test/confs/0612 b/test/confs/0612
index 84260df..da5b72f 100644
--- a/test/confs/0612
+++ b/test/confs/0612
@@ -1,5 +1,6 @@
# Exim test configuration 0612
-# log_defer_output on pipe transport
+
+SERVER =
.include DIR/aux-var/std_conf_prefix
@@ -7,35 +8,87 @@ primary_hostname = myhost.test.ex
# ----- Main settings -----
+.ifdef OPT
+dsn_advertise_hosts = *
+.endif
+delay_warning = 6s : 24h
+
+accept_8bitmime = false
+pipelining_advertise_hosts = :
+
+trusted_users = CALLER
+acl_smtp_rcpt = rcpt
+
log_selector = +received_recipients
+queue_only
+queue_run_in_order
+
+
+event_action = ${acl {ev_log}}
+
+#
-#acl_smtp_rcpt = accept
+begin acl
+
+ev_log:
+ accept logwrite = event $event_name
+
+rcpt:
+ accept hosts = HOSTIPV4
+
+ deny local_parts = rmt_reject
+ defer local_parts = rmt_defer
+ accept
# ----- Routers -----
begin routers
-client:
+r_dump:
+ driver = redirect
+ domains = dump.ex
+ data = :blackhole:
+
+r1:
driver = accept
- transport = pipe
+ condition = ${if eq {127.0.0.1}{$sender_host_address}}
+ transport = tofile
+
+r2:
+ driver = manualroute
+ local_parts = ^rmt_.*
+ route_list = * 127.0.0.1::PORT_D
+ self = send
+ transport = smtp
+
+r3:
+ driver = manualroute
+ local_parts = deferred
+ route_list = * 127.0.0.1::PORT_S
+ self = send
+ transport = bad_tpt
# ----- Transports -----
begin transports
-pipe:
- driver = pipe
- temp_errors = *
- command = perl -e "print 'Hi from pipe'; exit 5;"
- log_defer_output = true
- path = ${env{PATH}}
+smtp:
+ driver = smtp
+ event_action = ${acl {ev_log}}
+ hosts_try_fastopen = :
-# ----- Retry -----
+bad_tpt:
+ driver = smtp
+ connect_timeout = 1s
+ event_action = ${acl {ev_log}}
+tofile:
+ driver = appendfile
+ file = DIR/test-mail/${bless:$local_part}
+ user = CALLER
+ event_action = ${acl {ev_log}}
begin retry
-* * F,1h,10m
-
-
+* * F,2m,10s
# End
diff --git a/test/confs/0614 b/test/confs/0614
index d19be4e..eec6d32 100644
--- a/test/confs/0614
+++ b/test/confs/0614
@@ -1,15 +1,57 @@
# Exim test configuration 0614
-# hosts_connection_nolog versus sender_host lists caching
+# Add several messages going to the same location
+# And change smtp output based on senders domain
+
+hostlist loopback = <; 127.0.0.0/8 ; 0.0.0.0 ; ::1 ; 0000:0000:0000:0000:0000:ffff
+untrusted_set_sender = *
+
+SERVER =
.include DIR/aux-var/std_conf_prefix
-primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 0s
+log_selector = +sender_on_delivery
# ----- Main settings -----
-log_selector = +smtp_connection
-hostlist nolog = 127.0.0.1
-hosts_connection_nolog = +nolog
+acl_smtp_rcpt = accept
+
queue_only
+queue_run_in_order
+
+# ----- Routers -----
+
+begin routers
+
+client:
+ driver = accept
+ condition = ${if eq {SERVER}{server}{no}{yes}}
+ transport = send_to_server
+
+server:
+ driver = accept
+ transport = send_to_server
+
+
+# ----- Transports -----
+
+begin transports
+
+send_to_server:
+ driver = smtp
+ connection_max_messages = 0
+ allow_localhost
+ hosts = 127.0.0.1
+ port = PORT_D
+ hosts_try_fastopen = :
+ # assumes that HOSTIPV4 can send to 127.0.0.1
+ interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
+
+# ----- Retry -----
+
+begin retry
+
+* * F,5d,10s
# End
+
diff --git a/test/confs/0615 b/test/confs/0615
index 0cf5769..a1aae2a 100644
--- a/test/confs/0615
+++ b/test/confs/0615
@@ -1,32 +1,56 @@
# Exim test configuration 0615
+# Send many messages in hopes of tripping continuation records code
-keep_environment = PATH
-exim_path = EXIM_PATH
-spool_directory = DIR/spool
+hostlist loopback = <; 127.0.0.0/8 ; 0.0.0.0 ; ::1 ; 0000:0000:0000:0000:0000:ffff
+untrusted_set_sender = *
-log_file_path = DIR/spool/log/%slog : syslog
+SERVER =
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-chunking_advertise_hosts =
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
-.ifdef _HAVE_DMARC
-dmarc_tld_file =
-.endif
+rfc1413_query_timeout = 0s
+log_selector = +sender_on_delivery +millisec
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept
-primary_hostname = myhost.test.ex
queue_only
+queue_run_in_order
-# ----- Main settings -----
+# ----- Routers -----
+
+begin routers
+
+client:
+ driver = accept
+ condition = ${if eq {SERVER}{server}{no}{yes}}
+ transport = send_to_server
-log_selector = LOG_SELECTOR
-log_timezone = TIMES
+server:
+ driver = accept
+ transport = send_to_server
-syslog_timestamp = ARG1
-syslog_pid = ARG2
-acl_not_smtp = accept logwrite = msg
+# ----- Transports -----
+begin transports
+
+send_to_server:
+ driver = smtp
+ connection_max_messages = 0
+ allow_localhost
+ hosts = 127.0.0.1
+ port = PORT_D
+ hosts_try_fastopen = :
+ # assumes that HOSTIPV4 can sent to 127.0.0.1
+ interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
+
+# ----- Retry -----
+
+begin retry
+
+* * F,5d,10s
# End
+
diff --git a/test/confs/0618 b/test/confs/0618
index d212e98..420e290 100644
--- a/test/confs/0618
+++ b/test/confs/0618
@@ -1,94 +1,23 @@
# Exim test configuration 0618
-SERVER =
-
.include DIR/aux-var/std_conf_prefix
-primary_hostname = myhost.test.ex
# ----- Main settings -----
-.ifdef OPT
-dsn_advertise_hosts = *
-.endif
-delay_warning = 6s : 24h
-
-accept_8bitmime = false
-pipelining_advertise_hosts = :
+domainlist local_domains = @
-trusted_users = CALLER
-acl_smtp_rcpt = rcpt
+acl_smtp_rcpt = chk_rcpt
-log_selector = +received_recipients
queue_only
-queue_run_in_order
-
-event_action = ${acl {ev_log}}
-#
+# ----- ACL -----
begin acl
-ev_log:
- accept logwrite = event $event_name
-
-rcpt:
- accept hosts = HOSTIPV4
-
- deny local_parts = rmt_reject
- defer local_parts = rmt_defer
- accept
-
-# ----- Routers -----
-
-begin routers
-
-r_dump:
- driver = redirect
- domains = dump.ex
- data = :blackhole:
-
-r1:
- driver = accept
- condition = ${if eq {127.0.0.1}{$sender_host_address}}
- transport = tofile
-
-r2:
- driver = manualroute
- local_parts = ^rmt_.*
- route_list = * 127.0.0.1::PORT_D
- self = send
- transport = smtp
-
-r3:
- driver = manualroute
- local_parts = deferred
- route_list = * 127.0.0.1::PORT_S
- self = send
- transport = bad_tpt
-
-# ----- Transports -----
-
-begin transports
-
-smtp:
- driver = smtp
- event_action = ${acl {ev_log}}
- hosts_try_fastopen = :
-
-bad_tpt:
- driver = smtp
- connect_timeout = 1s
- event_action = ${acl {ev_log}}
-
-tofile:
- driver = appendfile
- file = DIR/test-mail/${bless:$local_part}
- user = CALLER
- event_action = ${acl {ev_log}}
-
-begin retry
+chk_rcpt:
+ accept local_parts = lsearch;DIR/aux-fixed/TESTNUM.list
+ domains = lsearch;DIR/aux-fixed/TESTNUM.list
-* * F,2m,10s
# End
diff --git a/test/confs/0619 b/test/confs/0619
index dcb7fa8..0736be6 100644
--- a/test/confs/0619
+++ b/test/confs/0619
@@ -1,30 +1,24 @@
# Exim test configuration 0619
-LOG_SELECTOR=
+.include DIR/aux-var/std_conf_prefix
-keep_environment = PATH
-exim_path = EXIM_PATH
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-chunking_advertise_hosts =
-tls_advertise_hosts =
-
-.ifdef _HAVE_DMARC
-dmarc_tld_file =
-.endif
+# ----- Main settings -----
-primary_hostname = myhost.test.ex
-queue_only
+primary_hostname = primaryhostname.ex
+hosts_treat_as_local = 46.test.ex
+allow_domain_literals
-# ----- Main settings -----
+acl_smtp_rcpt = chk_rcpt
-log_selector = LOG_SELECTOR
+# ----- ACL -----
-acl_not_smtp = accept
+begin acl
+chk_rcpt:
+ accept domains = OPT
+ logwrite = domain $domain
+ logwrite = value $domain_data
+ logwrite = \$0 '$0' \$1 '$1'
# End
diff --git a/test/confs/0620 b/test/confs/0620
deleted file mode 100644
index 6ee5ac6..0000000
--- a/test/confs/0620
+++ /dev/null
@@ -1,68 +0,0 @@
-# Exim test configuration 0166
-
-.include DIR/aux-var/std_conf_prefix
-
-
-# ----- Main settings -----
-
-domainlist local_domains = test.ex
-qualify_domain = test.ex
-
-acl_not_smtp = not_smtp
-
-begin acl
-
-not_smtp:
- accept log_message = rcpts <$recipients> local_part <$local_part>
-
-# ----- Routers -----
-
-begin routers
-
-hide_verifies:
- driver = accept
- verify_only
-
-alias:
- driver = redirect
- debug_print = DEBUG: $r_r1 $r_r2
- data = b
- # r_r1 checks that a variable with tainted data is ok
- # that the default list-sep ":" is not used for this list
- # that an '=' on the RHS is ok
- set = r_r1 = <$local_part> aaa:bbb bar=baz
- # r_local checks that a variable is immediately usable
- set = r_local = check
- errors_to = bad_$r_local
-
-user:
- driver = accept
- debug_print = DEBUG: $r_r1 $r_r2
- # r_r1 vs. r_r2 checks we can have multiple "set" options
- set = r_r1 = $local_part
- set = r_r2 = $local_part \
- 2a00:1940:100::ff:0:1 \
- foo=bar \
- # check we can get a newline into content
- newline=initial\n\tcont \
- # check we can get a list-sep into content (by doubling)
- semicolon=initial;;cont \
- ; \
- # r_r3 checks we can have a list as arg for a "set" option
- r_r3 = bletch
- transport = local_delivery
-
-
-# ----- Transports -----
-
-begin transports
-
-local_delivery:
- driver = appendfile
- envelope_to_add
- file = DIR/test-mail/${bless:$local_part}
- user = CALLER
- headers_add = X-r1: <$r_r1>\nX-r2: <$r_r2>\nX-r3: <$r_r3>
-
-
-# End
diff --git a/test/confs/0620 b/test/confs/0620
new file mode 120000
index 0000000..00d739d
--- /dev/null
+++ b/test/confs/0620
@@ -0,0 +1 @@
+0619
\ No newline at end of file
diff --git a/test/confs/0622 b/test/confs/0622
deleted file mode 100644
index 486bac2..0000000
--- a/test/confs/0622
+++ /dev/null
@@ -1,49 +0,0 @@
-# Exim test configuration 0622
-# Bounces
-
-.include DIR/aux-var/std_conf_prefix
-
-primary_hostname = myhost.test.ex
-
-# ----- Main settings -----
-
-acl_smtp_rcpt = accept
-log_selector = +received_recipients +millisec
-
-.ifdef OPT
-bounce_message_file = OPT
-warn_message_file = OPT
-.endif
-
-delay_warning = 1s
-
-# ----- Routers -----
-
-begin routers
-
-delay:
- driver = redirect
- local_parts = ^delay
- allow_defer
- data = :defer: deliberate for test purposes
-
-bounces:
- driver = accept
- condition = ${if !def:sender_address}
- transport = savebounce
-
-begin transports
-
-savebounce:
- driver = appendfile
- file = DIR/test-mail/bounce_message
- user = CALLER
-
-# ----- Retry -----
-
-begin retry
-
-* * F,5d,100s
-
-
-# End
diff --git a/test/confs/0623 b/test/confs/0623
deleted file mode 100644
index 7ac0ad3..0000000
--- a/test/confs/0623
+++ /dev/null
@@ -1,23 +0,0 @@
-# Exim test configuration 0623
-
-.include DIR/aux-var/std_conf_prefix
-
-
-# ----- Main settings -----
-
-domainlist local_domains = @
-
-acl_smtp_rcpt = chk_rcpt
-
-queue_only
-
-
-# ----- ACL -----
-
-begin acl
-
-chk_rcpt:
- accept local_parts = lsearch;DIR/aux-fixed/TESTNUM.list
- domains = lsearch;DIR/aux-fixed/TESTNUM.list
-
-# End
diff --git a/test/confs/0624 b/test/confs/0624
deleted file mode 100644
index c8178d2..0000000
--- a/test/confs/0624
+++ /dev/null
@@ -1,24 +0,0 @@
-# Exim test configuration 0624
-
-.include DIR/aux-var/std_conf_prefix
-
-
-# ----- Main settings -----
-
-primary_hostname = primaryhostname.ex
-hosts_treat_as_local = 46.test.ex
-allow_domain_literals
-
-acl_smtp_rcpt = chk_rcpt
-
-# ----- ACL -----
-
-begin acl
-
-chk_rcpt:
- accept domains = OPT
- logwrite = domain $domain
- logwrite = value $domain_data
- logwrite = \$0 '$0' \$1 '$1'
-
-# End
diff --git a/test/confs/0625 b/test/confs/0625
deleted file mode 120000
index f9ae37c..0000000
--- a/test/confs/0625
+++ /dev/null
@@ -1 +0,0 @@
-0624
\ No newline at end of file
diff --git a/test/log/0583 b/test/log/0583
index 94f171b..dcbd656 100644
--- a/test/log/0583
+++ b/test/log/0583
@@ -1,6 +1,17 @@
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: bcc recipient detected
-1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: bcc recipient detected
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: bcc recipient detected
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
+
+******** SERVER ********
+2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
+2017-07-30 18:51:05.712 router was called for quota_good@???
+2017-07-30 18:51:05.712 transport was called for quota_good@???
+2017-07-30 18:51:05.712 router was called for quota_fail@???
+2017-07-30 18:51:05.712 transport was called for quota_fail@???
+2017-07-30 18:51:05.712 where='quota' msg='Over quota'
+2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<b@???> rejected RCPT <quota_fail@???>: Over quota
+2017-07-30 18:51:05.712 router was called for route_fail@???
+2017-07-30 18:51:05.712 where='route' msg='Unrouteable address'
+2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<c@???> rejected RCPT <route_fail@???>: Unrouteable address
+2017-07-30 18:51:05.712 where='quota' msg='Previous (cached) quota verification failure'
+2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<e@???> rejected RCPT <quota_fail@???>: Previous (cached) quota verification failure
+2017-07-30 18:51:05.712 router was called for route_fail@???
+2017-07-30 18:51:05.712 where='route' msg='Unrouteable address'
+2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<f@???> rejected RCPT <route_fail@???>: Unrouteable address
diff --git a/test/log/0585 b/test/log/0585
index db6a92e..94f171b 100644
--- a/test/log/0585
+++ b/test/log/0585
@@ -1,2 +1,6 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == |TESTSUITE/bin/iefbr14 <pipe-userx=TESTSUITE/bin/iefbr14@???> R=r2 T=t2 defer (0): Tainted 'TESTSUITE/bin/iefbr14' (command for t2 transport) not permitted
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: bcc recipient detected
+1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: bcc recipient detected
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: bcc recipient detected
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
diff --git a/test/log/0608 b/test/log/0586
similarity index 100%
copy from test/log/0608
copy to test/log/0586
diff --git a/test/log/0588 b/test/log/0588
deleted file mode 100644
index 9446451..0000000
--- a/test/log/0588
+++ /dev/null
@@ -1,15 +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_D
-2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@??? H=(test) [127.0.0.1] P=smtp S=sss for good@???
-2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@??? H=(test) [127.0.0.1] P=smtp S=sss for bad@???
-2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss for good@???
-2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => :blackhole: <good@???> R=rx_dump
-2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmaX-0005vi-00 => good@??? F=<CALLER@???> R=smtp_try T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaZ-0005vi-00"
-2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmaY-0005vi-00 ** bad@??? F=<CALLER@???> R=smtp_try T=send_to_server: message has lines too long for transport
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 => :blackhole: <CALLER@???> R=rx_dump
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed
diff --git a/test/log/0589 b/test/log/0589
index dcbd656..9446451 100644
--- a/test/log/0589
+++ b/test/log/0589
@@ -1,17 +1,15 @@
******** SERVER ********
2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-2017-07-30 18:51:05.712 router was called for quota_good@???
-2017-07-30 18:51:05.712 transport was called for quota_good@???
-2017-07-30 18:51:05.712 router was called for quota_fail@???
-2017-07-30 18:51:05.712 transport was called for quota_fail@???
-2017-07-30 18:51:05.712 where='quota' msg='Over quota'
-2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<b@???> rejected RCPT <quota_fail@???>: Over quota
-2017-07-30 18:51:05.712 router was called for route_fail@???
-2017-07-30 18:51:05.712 where='route' msg='Unrouteable address'
-2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<c@???> rejected RCPT <route_fail@???>: Unrouteable address
-2017-07-30 18:51:05.712 where='quota' msg='Previous (cached) quota verification failure'
-2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<e@???> rejected RCPT <quota_fail@???>: Previous (cached) quota verification failure
-2017-07-30 18:51:05.712 router was called for route_fail@???
-2017-07-30 18:51:05.712 where='route' msg='Unrouteable address'
-2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<f@???> rejected RCPT <route_fail@???>: Unrouteable address
+2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@??? H=(test) [127.0.0.1] P=smtp S=sss for good@???
+2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@??? H=(test) [127.0.0.1] P=smtp S=sss for bad@???
+2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss for good@???
+2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => :blackhole: <good@???> R=rx_dump
+2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmaX-0005vi-00 => good@??? F=<CALLER@???> R=smtp_try T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaZ-0005vi-00"
+2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmaY-0005vi-00 ** bad@??? F=<CALLER@???> R=smtp_try T=send_to_server: message has lines too long for transport
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 => :blackhole: <CALLER@???> R=rx_dump
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed
diff --git a/test/log/0584 b/test/log/0593
similarity index 100%
rename from test/log/0584
rename to test/log/0593
diff --git a/test/log/0585 b/test/log/0594
similarity index 100%
copy from test/log/0585
copy to test/log/0594
diff --git a/test/log/0587 b/test/log/0596
similarity index 100%
rename from test/log/0587
rename to test/log/0596
diff --git a/test/log/0599 b/test/log/0597
similarity index 100%
copy from test/log/0599
copy to test/log/0597
diff --git a/test/log/0621 b/test/log/0598
similarity index 100%
rename from test/log/0621
rename to test/log/0598
diff --git a/test/log/0599 b/test/log/0599
index cef4d74..6f48bb0 100644
--- a/test/log/0599
+++ b/test/log/0599
@@ -1,45 +1,6 @@
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 => queue_only_1@??? R=outbound T=smtp 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 <= CALLER@??? U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** CALLER@???: Unrouteable address
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@???: Unrouteable address
+1999-03-02 09:44:33 10HmaY-0005vi-00 Frozen (delivery error message)
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => queue_only_2@??? R=outbound T=smtp 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 End queue run: pid=pppp
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <queue_only_1@???> R=discard_remote_source
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <queue_only_2@???> R=discard_remote_source
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmbB-0005vi-00 => first_pass_route_1@??? R=outbound T=smtp H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbC-0005vi-00"
-1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbD-0005vi-00 => first_pass_route_2@??? R=outbound T=smtp 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 End queue run: pid=pppp
-1999-03-02 09:44:33 Start queue run: pid=pppp
-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_D
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? H=(me) [127.0.0.1] P=smtp S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? H=(me) [127.0.0.1] P=smtp S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? H=(me) [127.0.0.1] P=smtp S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? H=(me) [127.0.0.1] P=smtp S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmbB-0005vi-00 == first_pass_route_1@??? R=outbound T=smtp defer (0): SMTP delivery explicitly queued
-1999-03-02 09:44:33 10HmbD-0005vi-00 == first_pass_route_2@??? R=outbound T=smtp defer (0): SMTP delivery explicitly queued
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <first_pass_route_1@???> R=discard_remote_source
-1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss
-1999-03-02 09:44:33 10HmbE-0005vi-00 no immediate delivery: queued by ACL
-1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <first_pass_route_2@???> R=discard_remote_source
-1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
diff --git a/test/log/0601 b/test/log/0601
index 6f48bb0..230bf71 100644
--- a/test/log/0601
+++ b/test/log/0601
@@ -1,6 +1,64 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** CALLER@???: Unrouteable address
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@???: Unrouteable address
-1999-03-02 09:44:33 10HmaY-0005vi-00 Frozen (delivery error message)
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-0005vi-00 msg
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 msg
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 10HmaZ-0005vi-00 msg
+2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 msg
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 [1234] 10HmbB-0005vi-00 msg
+1999-03-02 09:44:33 [1234] 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 [1235] 10HmbC-0005vi-00 msg
+1999-03-02 09:44:33 [1235] 10HmbC-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 [1236] 10HmbD-0005vi-00 msg
+2017-07-30 18:51:05.712 [1236] 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 [1237] 10HmbE-0005vi-00 msg
+2017-07-30 18:51:05.712 [1237] 10HmbE-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbF-0005vi-00 msg
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbG-0005vi-00 msg
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 10HmbH-0005vi-00 msg
+2017-07-30 18:51:05.712 10HmbH-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 10HmbI-0005vi-00 msg
+2017-07-30 18:51:05.712 10HmbI-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 [1238] 10HmbJ-0005vi-00 msg
+1999-03-02 09:44:33 [1238] 10HmbJ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 [1239] 10HmbK-0005vi-00 msg
+1999-03-02 09:44:33 [1239] 10HmbK-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 [1240] 10HmbL-0005vi-00 msg
+2017-07-30 18:51:05.712 [1240] 10HmbL-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 [1241] 10HmbM-0005vi-00 msg
+2017-07-30 18:51:05.712 [1241] 10HmbM-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbN-0005vi-00 msg
+1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbO-0005vi-00 msg
+1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 10HmbP-0005vi-00 msg
+2017-07-30 18:51:05.712 10HmbP-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 10HmbQ-0005vi-00 msg
+2017-07-30 18:51:05.712 10HmbQ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 [1242] 10HmbR-0005vi-00 msg
+1999-03-02 09:44:33 [1242] 10HmbR-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 [1243] 10HmbS-0005vi-00 msg
+1999-03-02 09:44:33 [1243] 10HmbS-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 [1244] 10HmbT-0005vi-00 msg
+2017-07-30 18:51:05.712 [1244] 10HmbT-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 [1245] 10HmbU-0005vi-00 msg
+2017-07-30 18:51:05.712 [1245] 10HmbU-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbV-0005vi-00 msg
+1999-03-02 09:44:33 10HmbV-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbW-0005vi-00 msg
+1999-03-02 09:44:33 10HmbW-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 10HmbX-0005vi-00 msg
+2017-07-30 18:51:05.712 10HmbX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 10HmbY-0005vi-00 msg
+2017-07-30 18:51:05.712 10HmbY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 [1246] 10HmbZ-0005vi-00 msg
+1999-03-02 09:44:33 [1246] 10HmbZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 [1247] 10HmcA-0005vi-00 msg
+1999-03-02 09:44:33 [1247] 10HmcA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 [1248] 10HmcB-0005vi-00 msg
+2017-07-30 18:51:05.712 [1248] 10HmcB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 [1249] 10HmcC-0005vi-00 msg
+2017-07-30 18:51:05.712 [1249] 10HmcC-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
diff --git a/test/log/0603 b/test/log/0603
index d7edb18..31de21b 100644
--- a/test/log/0603
+++ b/test/log/0603
@@ -1,29 +1,3 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= peter@??? U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= peter@??? U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp -qq
-1999-03-02 09:44:33 10HmaX-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbD-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbC-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbE-0005vi-00"
-1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbF-0005vi-00"
-1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbG-0005vi-00"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => bob@??? F=<peter@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbH-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 => bob@??? F=<peter@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbI-0005vi-00"
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qq
-
-******** 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 10HmbD-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@???
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbC-0005vi-00@???
-1999-03-02 09:44:33 10HmbF-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbB-0005vi-00@???
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaZ-0005vi-00@???
-1999-03-02 09:44:33 10HmbH-0005vi-00 <= peter@??? H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@???
-1999-03-02 09:44:33 10HmbI-0005vi-00 <= peter@??? H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmbA-0005vi-00@???
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for a
+1999-03-02 09:44:33 10HmaX-0005vi-00 <a@???>: pipe transport output: Hi from pipe
+1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=client T=pipe defer (0): Child process of pipe transport returned 5 from command: SYSBINDIR/perl
diff --git a/test/log/0604 b/test/log/0604
index abef7e7..36354ac 100644
--- a/test/log/0604
+++ b/test/log/0604
@@ -1,329 +1,10 @@
-2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbC-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbD-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbE-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbF-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbG-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbH-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbI-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbJ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbK-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbL-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbM-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbN-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbO-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbP-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbQ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbR-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbS-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbT-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbU-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbV-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbW-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbX-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbY-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmbZ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcA-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcB-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcC-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcD-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcE-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcF-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcG-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcH-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcI-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcJ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcK-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcL-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcM-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcN-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcO-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcP-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcQ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcR-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcS-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcT-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcU-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcV-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcW-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcX-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcY-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmcZ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdA-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdB-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdC-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdD-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdE-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdF-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdG-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdH-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdI-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdJ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdK-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdL-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdM-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdN-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdO-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdP-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdQ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdR-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdS-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdT-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdU-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdV-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdW-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdX-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdY-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 10HmdZ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
-2017-07-30 18:51:05.712 Start queue run: pid=pppp -qq
-2017-07-30 18:51:05.712 10HmaX-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmeA-0005vi-00"
-2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdZ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeB-0005vi-00"
-2017-07-30 18:51:05.712 10HmdZ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdY-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeC-0005vi-00"
-2017-07-30 18:51:05.712 10HmdY-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdX-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeD-0005vi-00"
-2017-07-30 18:51:05.712 10HmdX-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdW-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeE-0005vi-00"
-2017-07-30 18:51:05.712 10HmdW-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdV-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeF-0005vi-00"
-2017-07-30 18:51:05.712 10HmdV-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdU-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeG-0005vi-00"
-2017-07-30 18:51:05.712 10HmdU-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdT-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeH-0005vi-00"
-2017-07-30 18:51:05.712 10HmdT-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdS-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeI-0005vi-00"
-2017-07-30 18:51:05.712 10HmdS-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdR-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeJ-0005vi-00"
-2017-07-30 18:51:05.712 10HmdR-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdQ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeK-0005vi-00"
-2017-07-30 18:51:05.712 10HmdQ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdP-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeL-0005vi-00"
-2017-07-30 18:51:05.712 10HmdP-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdO-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeM-0005vi-00"
-2017-07-30 18:51:05.712 10HmdO-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdN-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeN-0005vi-00"
-2017-07-30 18:51:05.712 10HmdN-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdM-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeO-0005vi-00"
-2017-07-30 18:51:05.712 10HmdM-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdL-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeP-0005vi-00"
-2017-07-30 18:51:05.712 10HmdL-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdK-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeQ-0005vi-00"
-2017-07-30 18:51:05.712 10HmdK-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdJ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeR-0005vi-00"
-2017-07-30 18:51:05.712 10HmdJ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdI-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeS-0005vi-00"
-2017-07-30 18:51:05.712 10HmdI-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdH-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeT-0005vi-00"
-2017-07-30 18:51:05.712 10HmdH-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdG-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeU-0005vi-00"
-2017-07-30 18:51:05.712 10HmdG-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdF-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeV-0005vi-00"
-2017-07-30 18:51:05.712 10HmdF-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdE-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeW-0005vi-00"
-2017-07-30 18:51:05.712 10HmdE-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdD-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeX-0005vi-00"
-2017-07-30 18:51:05.712 10HmdD-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdC-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeY-0005vi-00"
-2017-07-30 18:51:05.712 10HmdC-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdB-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeZ-0005vi-00"
-2017-07-30 18:51:05.712 10HmdB-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmdA-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfA-0005vi-00"
-2017-07-30 18:51:05.712 10HmdA-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcZ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfB-0005vi-00"
-2017-07-30 18:51:05.712 10HmcZ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcY-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfC-0005vi-00"
-2017-07-30 18:51:05.712 10HmcY-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcX-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfD-0005vi-00"
-2017-07-30 18:51:05.712 10HmcX-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcW-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfE-0005vi-00"
-2017-07-30 18:51:05.712 10HmcW-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcV-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfF-0005vi-00"
-2017-07-30 18:51:05.712 10HmcV-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcU-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfG-0005vi-00"
-2017-07-30 18:51:05.712 10HmcU-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcT-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfH-0005vi-00"
-2017-07-30 18:51:05.712 10HmcT-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcS-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfI-0005vi-00"
-2017-07-30 18:51:05.712 10HmcS-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcR-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfJ-0005vi-00"
-2017-07-30 18:51:05.712 10HmcR-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcQ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfK-0005vi-00"
-2017-07-30 18:51:05.712 10HmcQ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcP-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfL-0005vi-00"
-2017-07-30 18:51:05.712 10HmcP-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcO-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfM-0005vi-00"
-2017-07-30 18:51:05.712 10HmcO-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcN-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfN-0005vi-00"
-2017-07-30 18:51:05.712 10HmcN-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcM-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfO-0005vi-00"
-2017-07-30 18:51:05.712 10HmcM-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcL-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfP-0005vi-00"
-2017-07-30 18:51:05.712 10HmcL-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcK-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfQ-0005vi-00"
-2017-07-30 18:51:05.712 10HmcK-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcJ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfR-0005vi-00"
-2017-07-30 18:51:05.712 10HmcJ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcI-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfS-0005vi-00"
-2017-07-30 18:51:05.712 10HmcI-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcH-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfT-0005vi-00"
-2017-07-30 18:51:05.712 10HmcH-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcG-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfU-0005vi-00"
-2017-07-30 18:51:05.712 10HmcG-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcF-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfV-0005vi-00"
-2017-07-30 18:51:05.712 10HmcF-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcE-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfW-0005vi-00"
-2017-07-30 18:51:05.712 10HmcE-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcD-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfX-0005vi-00"
-2017-07-30 18:51:05.712 10HmcD-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcC-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfY-0005vi-00"
-2017-07-30 18:51:05.712 10HmcC-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcB-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfZ-0005vi-00"
-2017-07-30 18:51:05.712 10HmcB-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmcA-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgA-0005vi-00"
-2017-07-30 18:51:05.712 10HmcA-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbZ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgB-0005vi-00"
-2017-07-30 18:51:05.712 10HmbZ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbY-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgC-0005vi-00"
-2017-07-30 18:51:05.712 10HmbY-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbX-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgD-0005vi-00"
-2017-07-30 18:51:05.712 10HmbX-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbW-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgE-0005vi-00"
-2017-07-30 18:51:05.712 10HmbW-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbV-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgF-0005vi-00"
-2017-07-30 18:51:05.712 10HmbV-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbU-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgG-0005vi-00"
-2017-07-30 18:51:05.712 10HmbU-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbT-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgH-0005vi-00"
-2017-07-30 18:51:05.712 10HmbT-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbS-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgI-0005vi-00"
-2017-07-30 18:51:05.712 10HmbS-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbR-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgJ-0005vi-00"
-2017-07-30 18:51:05.712 10HmbR-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbQ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgK-0005vi-00"
-2017-07-30 18:51:05.712 10HmbQ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbP-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgL-0005vi-00"
-2017-07-30 18:51:05.712 10HmbP-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbO-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgM-0005vi-00"
-2017-07-30 18:51:05.712 10HmbO-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbN-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgN-0005vi-00"
-2017-07-30 18:51:05.712 10HmbN-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbM-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgO-0005vi-00"
-2017-07-30 18:51:05.712 10HmbM-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbL-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgP-0005vi-00"
-2017-07-30 18:51:05.712 10HmbL-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbK-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgQ-0005vi-00"
-2017-07-30 18:51:05.712 10HmbK-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbJ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgR-0005vi-00"
-2017-07-30 18:51:05.712 10HmbJ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbI-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgS-0005vi-00"
-2017-07-30 18:51:05.712 10HmbI-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbH-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgT-0005vi-00"
-2017-07-30 18:51:05.712 10HmbH-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbG-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgU-0005vi-00"
-2017-07-30 18:51:05.712 10HmbG-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbF-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgV-0005vi-00"
-2017-07-30 18:51:05.712 10HmbF-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbE-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgW-0005vi-00"
-2017-07-30 18:51:05.712 10HmbE-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbD-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgX-0005vi-00"
-2017-07-30 18:51:05.712 10HmbD-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbC-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgY-0005vi-00"
-2017-07-30 18:51:05.712 10HmbC-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbB-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgZ-0005vi-00"
-2017-07-30 18:51:05.712 10HmbB-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmhA-0005vi-00"
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmhB-0005vi-00"
-2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmaY-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmhC-0005vi-00"
-2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed
-2017-07-30 18:51:05.712 End queue run: pid=pppp -qq
-
-******** SERVER ********
-2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-2017-07-30 18:51:05.712 10HmeA-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeB-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdZ-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeC-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdY-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeD-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdX-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeE-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdW-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeF-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdV-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeG-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdU-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeH-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdT-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeI-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdS-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeJ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdR-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeK-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdQ-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeL-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdP-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeM-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdO-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeN-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdN-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeO-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdM-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeP-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdL-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeQ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdK-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeR-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdJ-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeS-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdI-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeT-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdH-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeU-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdG-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeV-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdF-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeW-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdE-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeX-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdD-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeY-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdC-0005vi-00@???
-2017-07-30 18:51:05.712 10HmeZ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdB-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfA-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdA-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfB-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcZ-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfC-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcY-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfD-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcX-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfE-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcW-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfF-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcV-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfG-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcU-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfH-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcT-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfI-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcS-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfJ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcR-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfK-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcQ-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfL-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcP-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfM-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcO-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfN-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcN-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfO-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcM-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfP-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcL-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfQ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcK-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfR-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcJ-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfS-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcI-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfT-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcH-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfU-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcG-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfV-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcF-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfW-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcE-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfX-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcD-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfY-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcC-0005vi-00@???
-2017-07-30 18:51:05.712 10HmfZ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcB-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgA-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcA-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgB-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbZ-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgC-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbY-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgD-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbX-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgE-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbW-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgF-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbV-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgG-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbU-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgH-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbT-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgI-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbS-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgJ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbR-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgK-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbQ-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgL-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbP-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgM-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbO-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgN-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbN-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgO-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbM-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgP-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbL-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgQ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbK-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgR-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbJ-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgS-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbI-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgT-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbH-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgU-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbG-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgV-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbF-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgW-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbE-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgX-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbD-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgY-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbC-0005vi-00@???
-2017-07-30 18:51:05.712 10HmgZ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbB-0005vi-00@???
-2017-07-30 18:51:05.712 10HmhA-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbA-0005vi-00@???
-2017-07-30 18:51:05.712 10HmhB-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaZ-0005vi-00@???
-2017-07-30 18:51:05.712 10HmhC-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@???
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss id=original1235@??? for a@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for b@???
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss id*=E10HmaZ-0005vi-00@??? for c@???
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss id=original1235@??? for d@???
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@???: Unrouteable address
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 ** b@???: Unrouteable address
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss id*=E10HmbC-0005vi-00@??? for CALLER@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/0614 b/test/log/0605
similarity index 100%
copy from test/log/0614
copy to test/log/0605
diff --git a/test/log/0620 b/test/log/0606
similarity index 100%
copy from test/log/0620
copy to test/log/0606
diff --git a/test/log/0608 b/test/log/0608
index 3b4dceb..5331ae4 100644
--- a/test/log/0608
+++ b/test/log/0608
@@ -1,5 +1,74 @@
+2017-07-30 18:51:05.712 10HmbC-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for a@???
+2017-07-30 18:51:05.712 10HmbC-0005vi-00 ** a@???: Unrouteable address
+2017-07-30 18:51:05.712 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+2017-07-30 18:51:05.712 10HmbD-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
+2017-07-30 18:51:05.712 10HmbD-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbC-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbE-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for b@???
+2017-07-30 18:51:05.712 10HmbE-0005vi-00 ** b@???: Unrouteable address
+2017-07-30 18:51:05.712 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+2017-07-30 18:51:05.712 10HmbF-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
+2017-07-30 18:51:05.712 10HmbF-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbE-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for c@???
+2017-07-30 18:51:05.712 10HmaX-0005vi-00 ** c@???: Unrouteable address
+2017-07-30 18:51:05.712 10HmaX-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for error message texts: No such file or directory
+2017-07-30 18:51:05.712 10HmbG-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+2017-07-30 18:51:05.712 10HmbG-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
+2017-07-30 18:51:05.712 10HmbG-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for d@???
+2017-07-30 18:51:05.712 10HmaY-0005vi-00 ** d@???: Unrouteable address
+2017-07-30 18:51:05.712 10HmaY-0005vi-00 bounce_message_file is not absolute after expansion: 'relative_file_path'
-******** 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 helo localhost dnssec <no>
-1999-03-02 09:44:33 helo l-sec dnssec <yes>
+2017-07-30 18:51:05.712 10HmbH-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+2017-07-30 18:51:05.712 10HmbH-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
+2017-07-30 18:51:05.712 10HmbH-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for e@???
+2017-07-30 18:51:05.712 10HmaZ-0005vi-00 ** e@???: Unrouteable address
+2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Failed to expand bounce_message_file: '$acl_m_unset'
+
+2017-07-30 18:51:05.712 10HmbI-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+2017-07-30 18:51:05.712 10HmbI-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
+2017-07-30 18:51:05.712 10HmbI-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for f@???
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 ** f@???: Unrouteable address
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@???'
+
+2017-07-30 18:51:05.712 10HmbJ-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+2017-07-30 18:51:05.712 10HmbJ-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
+2017-07-30 18:51:05.712 10HmbJ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbK-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for g@???
+2017-07-30 18:51:05.712 10HmbK-0005vi-00 ** g@???: Unrouteable address
+2017-07-30 18:51:05.712 10HmbL-0005vi-00 <= <> R=10HmbK-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+2017-07-30 18:51:05.712 10HmbL-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
+2017-07-30 18:51:05.712 10HmbL-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbK-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbM-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for delay_p@???
+2017-07-30 18:51:05.712 10HmbM-0005vi-00 == delay_p@??? R=delay defer (-1): deliberate for test purposes
+2017-07-30 18:51:05.712 10HmbN-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for delay_q@???
+2017-07-30 18:51:05.712 10HmbN-0005vi-00 == delay_q@??? R=delay defer (-1): deliberate for test purposes
+2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for delay_r@???
+2017-07-30 18:51:05.712 10HmbB-0005vi-00 == delay_r@??? R=delay defer (-1): deliberate for test purposes
+2017-07-30 18:51:05.712 10HmbO-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for delay_s@???
+2017-07-30 18:51:05.712 10HmbO-0005vi-00 == delay_s@??? R=delay defer (-1): deliberate for test purposes
+2017-07-30 18:51:05.712 10HmbM-0005vi-00 == delay_p@??? R=delay defer (-1): deliberate for test purposes
+2017-07-30 18:51:05.712 10HmbP-0005vi-00 <= <> R=10HmbM-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+2017-07-30 18:51:05.712 10HmbP-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
+2017-07-30 18:51:05.712 10HmbP-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbN-0005vi-00 == delay_q@??? R=delay defer (-1): deliberate for test purposes
+2017-07-30 18:51:05.712 10HmbQ-0005vi-00 <= <> R=10HmbN-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+2017-07-30 18:51:05.712 10HmbQ-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
+2017-07-30 18:51:05.712 10HmbQ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbB-0005vi-00 == delay_r@??? R=delay defer (-1): deliberate for test purposes
+2017-07-30 18:51:05.712 10HmbB-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for warning message texts: No such file or directory
+2017-07-30 18:51:05.712 10HmbR-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+2017-07-30 18:51:05.712 10HmbR-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
+2017-07-30 18:51:05.712 10HmbR-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbO-0005vi-00 == delay_s@??? R=delay defer (-1): deliberate for test purposes
+2017-07-30 18:51:05.712 10HmbS-0005vi-00 <= <> R=10HmbO-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
+2017-07-30 18:51:05.712 10HmbS-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
+2017-07-30 18:51:05.712 10HmbS-0005vi-00 Completed
diff --git a/test/log/0612 b/test/log/0612
index 31de21b..0c818ae 100644
--- a/test/log/0612
+++ b/test/log/0612
@@ -1,3 +1,104 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for a
-1999-03-02 09:44:33 10HmaX-0005vi-00 <a@???>: pipe transport output: Hi from pipe
-1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=client T=pipe defer (0): Child process of pipe transport returned 5 from command: SYSBINDIR/perl
+1999-03-02 09:44:33 rej/never
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmaX-0005vi-00 event tcp:connect
+1999-03-02 09:44:33 10HmaX-0005vi-00 event smtp:connect
+1999-03-02 09:44:33 10HmaX-0005vi-00 event smtp:ehlo
+1999-03-02 09:44:33 10HmaX-0005vi-00 event tcp:close
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** rmt_reject@??? R=r2 T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rmt_reject@???>: 550 Administrative prohibition
+1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:fail:delivery
+1999-03-02 09:44:33 10HmaX-0005vi-00 rmt_reject@???: error ignored: RFC 3461 DSN, failure notify not requested
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:complete
+1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 accept/success
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmaY-0005vi-00 event tcp:connect
+1999-03-02 09:44:33 10HmaY-0005vi-00 event smtp:connect
+1999-03-02 09:44:33 10HmaY-0005vi-00 event smtp:ehlo
+1999-03-02 09:44:33 10HmaY-0005vi-00 event tcp:close
+1999-03-02 09:44:33 10HmaY-0005vi-00 => rmt_accept@??? R=r2 T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 event msg:delivery
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 event msg:complete
+1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => rmt_accept <rmt_accept@???> R=r1 T=tofile
+1999-03-02 09:44:33 10HmaZ-0005vi-00 event msg:delivery
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss for b@???
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 event msg:complete
+1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <b@???> R=r_dump
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-0005vi-00 event msg:complete
+1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 defer/delay
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmbB-0005vi-00 event tcp:connect
+1999-03-02 09:44:33 10HmbB-0005vi-00 event smtp:connect
+1999-03-02 09:44:33 10HmbB-0005vi-00 event smtp:ehlo
+1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:rcpt:host:defer
+1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:rcpt:defer
+1999-03-02 09:44:33 10HmbB-0005vi-00 event tcp:close
+1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@??? R=r2 T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rmt_defer@???>: 451 Temporary local problem - please try later
+1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 defer/never
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@??? routing defer (-52): retry time not reached
+1999-03-02 09:44:33 10HmbC-0005vi-00 event tcp:connect
+1999-03-02 09:44:33 10HmbC-0005vi-00 event smtp:connect
+1999-03-02 09:44:33 10HmbC-0005vi-00 event smtp:ehlo
+1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:rcpt:host:defer
+1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:rcpt:defer
+1999-03-02 09:44:33 10HmbC-0005vi-00 event tcp:close
+1999-03-02 09:44:33 10HmbC-0005vi-00 == rmt_defer@??? R=r2 T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rmt_defer@???>: 451 Temporary local problem - please try later
+1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 playout
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@??? routing defer (-52): retry time not reached
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss for c@???
+1999-03-02 09:44:33 10HmbC-0005vi-00 == rmt_defer@??? routing defer (-52): retry time not reached
+1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:fail:internal
+1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:complete
+1999-03-02 09:44:33 10HmbB-0005vi-00 removed by CALLER
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:fail:internal
+1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:complete
+1999-03-02 09:44:33 10HmbC-0005vi-00 removed by CALLER
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 rej/failure+delay
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmbD-0005vi-00 => :blackhole: <c@???> R=r_dump
+1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbD-0005vi-00 event msg:complete
+1999-03-02 09:44:33 10HmbE-0005vi-00 event tcp:connect
+1999-03-02 09:44:33 10HmbE-0005vi-00 event smtp:connect
+1999-03-02 09:44:33 10HmbE-0005vi-00 event smtp:ehlo
+1999-03-02 09:44:33 10HmbE-0005vi-00 event tcp:close
+1999-03-02 09:44:33 10HmbE-0005vi-00 ** rmt_reject@??? R=r2 T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rmt_reject@???>: 550 Administrative prohibition
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=EXIMUSER P=local S=sss for e@???
+1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbE-0005vi-00 event msg:complete
+1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 deliver DSN
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmbF-0005vi-00 => :blackhole: <e@???> R=r_dump
+1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbF-0005vi-00 event msg:complete
+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_D
+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 10HmaX-0005vi-00 <= a@??? H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_reject@???
+1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<a@???> rejected RCPT <rmt_reject@???>
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= b@??? H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_accept@???
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@??? H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss for rmt_accept@???
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= c@??? H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_defer@???
+1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<c@???> temporarily rejected RCPT <rmt_defer@???>
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= d@??? H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_defer@???
+1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<d@???> temporarily rejected RCPT <rmt_defer@???>
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= e@??? H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_reject@???
+1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<e@???> rejected RCPT <rmt_reject@???>
diff --git a/test/log/0614 b/test/log/0614
index 2de5555..d7edb18 100644
--- a/test/log/0614
+++ b/test/log/0614
@@ -1,5 +1,29 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= peter@??? U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= peter@??? U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 Start queue run: pid=pppp -qq
+1999-03-02 09:44:33 10HmaX-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbD-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbC-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbE-0005vi-00"
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbB-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbF-0005vi-00"
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbG-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 => bob@??? F=<peter@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbH-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-0005vi-00 => bob@??? F=<peter@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmbI-0005vi-00"
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qq
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4] (TCP/IP connection count = 1)
-1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4] closed by QUIT
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbC-0005vi-00@???
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbB-0005vi-00@???
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaZ-0005vi-00@???
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= peter@??? H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@???
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= peter@??? H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmbA-0005vi-00@???
diff --git a/test/log/0615 b/test/log/0615
index 230bf71..abef7e7 100644
--- a/test/log/0615
+++ b/test/log/0615
@@ -1,64 +1,329 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 msg
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 msg
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 10HmaZ-0005vi-00 msg
-2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 msg
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 [1234] 10HmbB-0005vi-00 msg
-1999-03-02 09:44:33 [1234] 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 [1235] 10HmbC-0005vi-00 msg
-1999-03-02 09:44:33 [1235] 10HmbC-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 [1236] 10HmbD-0005vi-00 msg
-2017-07-30 18:51:05.712 [1236] 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 [1237] 10HmbE-0005vi-00 msg
-2017-07-30 18:51:05.712 [1237] 10HmbE-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbF-0005vi-00 msg
-1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbG-0005vi-00 msg
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 10HmbH-0005vi-00 msg
-2017-07-30 18:51:05.712 10HmbH-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 10HmbI-0005vi-00 msg
-2017-07-30 18:51:05.712 10HmbI-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 [1238] 10HmbJ-0005vi-00 msg
-1999-03-02 09:44:33 [1238] 10HmbJ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 [1239] 10HmbK-0005vi-00 msg
-1999-03-02 09:44:33 [1239] 10HmbK-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 [1240] 10HmbL-0005vi-00 msg
-2017-07-30 18:51:05.712 [1240] 10HmbL-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 [1241] 10HmbM-0005vi-00 msg
-2017-07-30 18:51:05.712 [1241] 10HmbM-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbN-0005vi-00 msg
-1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbO-0005vi-00 msg
-1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 10HmbP-0005vi-00 msg
-2017-07-30 18:51:05.712 10HmbP-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 10HmbQ-0005vi-00 msg
-2017-07-30 18:51:05.712 10HmbQ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 [1242] 10HmbR-0005vi-00 msg
-1999-03-02 09:44:33 [1242] 10HmbR-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 [1243] 10HmbS-0005vi-00 msg
-1999-03-02 09:44:33 [1243] 10HmbS-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 [1244] 10HmbT-0005vi-00 msg
-2017-07-30 18:51:05.712 [1244] 10HmbT-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 [1245] 10HmbU-0005vi-00 msg
-2017-07-30 18:51:05.712 [1245] 10HmbU-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbV-0005vi-00 msg
-1999-03-02 09:44:33 10HmbV-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbW-0005vi-00 msg
-1999-03-02 09:44:33 10HmbW-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 10HmbX-0005vi-00 msg
-2017-07-30 18:51:05.712 10HmbX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 10HmbY-0005vi-00 msg
-2017-07-30 18:51:05.712 10HmbY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 [1246] 10HmbZ-0005vi-00 msg
-1999-03-02 09:44:33 [1246] 10HmbZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 [1247] 10HmcA-0005vi-00 msg
-1999-03-02 09:44:33 [1247] 10HmcA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 [1248] 10HmcB-0005vi-00 msg
-2017-07-30 18:51:05.712 [1248] 10HmcB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-2017-07-30 18:51:05.712 [1249] 10HmcC-0005vi-00 msg
-2017-07-30 18:51:05.712 [1249] 10HmcC-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbC-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbD-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbE-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbF-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbG-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbH-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbI-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbJ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbK-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbL-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbM-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbN-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbO-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbP-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbQ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbR-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbS-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbT-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbU-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbV-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbW-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbX-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbY-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmbZ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcA-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcB-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcC-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcD-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcE-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcF-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcG-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcH-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcI-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcJ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcK-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcL-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcM-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcN-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcO-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcP-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcQ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcR-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcS-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcT-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcU-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcV-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcW-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcX-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcY-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmcZ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdA-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdB-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdC-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdD-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdE-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdF-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdG-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdH-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdI-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdJ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdK-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdL-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdM-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdN-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdO-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdP-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdQ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdR-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdS-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdT-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdU-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdV-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdW-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdX-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdY-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 10HmdZ-0005vi-00 <= ralph@??? U=CALLER P=local-smtp S=sss
+2017-07-30 18:51:05.712 Start queue run: pid=pppp -qq
+2017-07-30 18:51:05.712 10HmaX-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmeA-0005vi-00"
+2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdZ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeB-0005vi-00"
+2017-07-30 18:51:05.712 10HmdZ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdY-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeC-0005vi-00"
+2017-07-30 18:51:05.712 10HmdY-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdX-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeD-0005vi-00"
+2017-07-30 18:51:05.712 10HmdX-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdW-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeE-0005vi-00"
+2017-07-30 18:51:05.712 10HmdW-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdV-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeF-0005vi-00"
+2017-07-30 18:51:05.712 10HmdV-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdU-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeG-0005vi-00"
+2017-07-30 18:51:05.712 10HmdU-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdT-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeH-0005vi-00"
+2017-07-30 18:51:05.712 10HmdT-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdS-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeI-0005vi-00"
+2017-07-30 18:51:05.712 10HmdS-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdR-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeJ-0005vi-00"
+2017-07-30 18:51:05.712 10HmdR-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdQ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeK-0005vi-00"
+2017-07-30 18:51:05.712 10HmdQ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdP-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeL-0005vi-00"
+2017-07-30 18:51:05.712 10HmdP-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdO-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeM-0005vi-00"
+2017-07-30 18:51:05.712 10HmdO-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdN-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeN-0005vi-00"
+2017-07-30 18:51:05.712 10HmdN-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdM-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeO-0005vi-00"
+2017-07-30 18:51:05.712 10HmdM-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdL-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeP-0005vi-00"
+2017-07-30 18:51:05.712 10HmdL-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdK-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeQ-0005vi-00"
+2017-07-30 18:51:05.712 10HmdK-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdJ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeR-0005vi-00"
+2017-07-30 18:51:05.712 10HmdJ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdI-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeS-0005vi-00"
+2017-07-30 18:51:05.712 10HmdI-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdH-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeT-0005vi-00"
+2017-07-30 18:51:05.712 10HmdH-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdG-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeU-0005vi-00"
+2017-07-30 18:51:05.712 10HmdG-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdF-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeV-0005vi-00"
+2017-07-30 18:51:05.712 10HmdF-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdE-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeW-0005vi-00"
+2017-07-30 18:51:05.712 10HmdE-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdD-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeX-0005vi-00"
+2017-07-30 18:51:05.712 10HmdD-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdC-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeY-0005vi-00"
+2017-07-30 18:51:05.712 10HmdC-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdB-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmeZ-0005vi-00"
+2017-07-30 18:51:05.712 10HmdB-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmdA-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfA-0005vi-00"
+2017-07-30 18:51:05.712 10HmdA-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcZ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfB-0005vi-00"
+2017-07-30 18:51:05.712 10HmcZ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcY-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfC-0005vi-00"
+2017-07-30 18:51:05.712 10HmcY-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcX-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfD-0005vi-00"
+2017-07-30 18:51:05.712 10HmcX-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcW-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfE-0005vi-00"
+2017-07-30 18:51:05.712 10HmcW-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcV-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfF-0005vi-00"
+2017-07-30 18:51:05.712 10HmcV-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcU-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfG-0005vi-00"
+2017-07-30 18:51:05.712 10HmcU-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcT-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfH-0005vi-00"
+2017-07-30 18:51:05.712 10HmcT-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcS-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfI-0005vi-00"
+2017-07-30 18:51:05.712 10HmcS-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcR-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfJ-0005vi-00"
+2017-07-30 18:51:05.712 10HmcR-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcQ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfK-0005vi-00"
+2017-07-30 18:51:05.712 10HmcQ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcP-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfL-0005vi-00"
+2017-07-30 18:51:05.712 10HmcP-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcO-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfM-0005vi-00"
+2017-07-30 18:51:05.712 10HmcO-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcN-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfN-0005vi-00"
+2017-07-30 18:51:05.712 10HmcN-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcM-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfO-0005vi-00"
+2017-07-30 18:51:05.712 10HmcM-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcL-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfP-0005vi-00"
+2017-07-30 18:51:05.712 10HmcL-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcK-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfQ-0005vi-00"
+2017-07-30 18:51:05.712 10HmcK-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcJ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfR-0005vi-00"
+2017-07-30 18:51:05.712 10HmcJ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcI-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfS-0005vi-00"
+2017-07-30 18:51:05.712 10HmcI-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcH-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfT-0005vi-00"
+2017-07-30 18:51:05.712 10HmcH-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcG-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfU-0005vi-00"
+2017-07-30 18:51:05.712 10HmcG-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcF-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfV-0005vi-00"
+2017-07-30 18:51:05.712 10HmcF-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcE-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfW-0005vi-00"
+2017-07-30 18:51:05.712 10HmcE-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcD-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfX-0005vi-00"
+2017-07-30 18:51:05.712 10HmcD-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcC-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfY-0005vi-00"
+2017-07-30 18:51:05.712 10HmcC-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcB-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmfZ-0005vi-00"
+2017-07-30 18:51:05.712 10HmcB-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmcA-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgA-0005vi-00"
+2017-07-30 18:51:05.712 10HmcA-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbZ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgB-0005vi-00"
+2017-07-30 18:51:05.712 10HmbZ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbY-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgC-0005vi-00"
+2017-07-30 18:51:05.712 10HmbY-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbX-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgD-0005vi-00"
+2017-07-30 18:51:05.712 10HmbX-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbW-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgE-0005vi-00"
+2017-07-30 18:51:05.712 10HmbW-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbV-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgF-0005vi-00"
+2017-07-30 18:51:05.712 10HmbV-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbU-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgG-0005vi-00"
+2017-07-30 18:51:05.712 10HmbU-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbT-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgH-0005vi-00"
+2017-07-30 18:51:05.712 10HmbT-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbS-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgI-0005vi-00"
+2017-07-30 18:51:05.712 10HmbS-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbR-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgJ-0005vi-00"
+2017-07-30 18:51:05.712 10HmbR-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbQ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgK-0005vi-00"
+2017-07-30 18:51:05.712 10HmbQ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbP-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgL-0005vi-00"
+2017-07-30 18:51:05.712 10HmbP-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbO-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgM-0005vi-00"
+2017-07-30 18:51:05.712 10HmbO-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbN-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgN-0005vi-00"
+2017-07-30 18:51:05.712 10HmbN-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbM-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgO-0005vi-00"
+2017-07-30 18:51:05.712 10HmbM-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbL-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgP-0005vi-00"
+2017-07-30 18:51:05.712 10HmbL-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbK-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgQ-0005vi-00"
+2017-07-30 18:51:05.712 10HmbK-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbJ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgR-0005vi-00"
+2017-07-30 18:51:05.712 10HmbJ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbI-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgS-0005vi-00"
+2017-07-30 18:51:05.712 10HmbI-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbH-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgT-0005vi-00"
+2017-07-30 18:51:05.712 10HmbH-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbG-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgU-0005vi-00"
+2017-07-30 18:51:05.712 10HmbG-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbF-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgV-0005vi-00"
+2017-07-30 18:51:05.712 10HmbF-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbE-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgW-0005vi-00"
+2017-07-30 18:51:05.712 10HmbE-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbD-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgX-0005vi-00"
+2017-07-30 18:51:05.712 10HmbD-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbC-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgY-0005vi-00"
+2017-07-30 18:51:05.712 10HmbC-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbB-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmgZ-0005vi-00"
+2017-07-30 18:51:05.712 10HmbB-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmhA-0005vi-00"
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmhB-0005vi-00"
+2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed
+2017-07-30 18:51:05.712 10HmaY-0005vi-00 => bob@??? F=<ralph@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK id=10HmhC-0005vi-00"
+2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed
+2017-07-30 18:51:05.712 End queue run: pid=pppp -qq
+
+******** SERVER ********
+2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
+2017-07-30 18:51:05.712 10HmeA-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeB-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdZ-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeC-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdY-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeD-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdX-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeE-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdW-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeF-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdV-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeG-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdU-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeH-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdT-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeI-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdS-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeJ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdR-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeK-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdQ-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeL-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdP-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeM-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdO-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeN-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdN-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeO-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdM-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeP-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdL-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeQ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdK-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeR-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdJ-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeS-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdI-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeT-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdH-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeU-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdG-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeV-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdF-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeW-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdE-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeX-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdD-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeY-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdC-0005vi-00@???
+2017-07-30 18:51:05.712 10HmeZ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdB-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfA-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmdA-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfB-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcZ-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfC-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcY-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfD-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcX-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfE-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcW-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfF-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcV-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfG-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcU-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfH-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcT-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfI-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcS-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfJ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcR-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfK-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcQ-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfL-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcP-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfM-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcO-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfN-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcN-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfO-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcM-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfP-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcL-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfQ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcK-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfR-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcJ-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfS-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcI-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfT-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcH-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfU-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcG-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfV-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcF-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfW-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcE-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfX-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcD-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfY-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcC-0005vi-00@???
+2017-07-30 18:51:05.712 10HmfZ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcB-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgA-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmcA-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgB-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbZ-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgC-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbY-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgD-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbX-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgE-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbW-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgF-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbV-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgG-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbU-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgH-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbT-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgI-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbS-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgJ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbR-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgK-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbQ-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgL-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbP-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgM-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbO-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgN-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbN-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgO-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbM-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgP-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbL-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgQ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbK-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgR-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbJ-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgS-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbI-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgT-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbH-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgU-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbG-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgV-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbF-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgW-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbE-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgX-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbD-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgY-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbC-0005vi-00@???
+2017-07-30 18:51:05.712 10HmgZ-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbB-0005vi-00@???
+2017-07-30 18:51:05.712 10HmhA-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbA-0005vi-00@???
+2017-07-30 18:51:05.712 10HmhB-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaZ-0005vi-00@???
+2017-07-30 18:51:05.712 10HmhC-0005vi-00 <= ralph@??? H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@???
diff --git a/test/log/0618 b/test/log/0618
index 0c818ae..c84f874 100644
--- a/test/log/0618
+++ b/test/log/0618
@@ -1,104 +1,6 @@
-1999-03-02 09:44:33 rej/never
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 event tcp:connect
-1999-03-02 09:44:33 10HmaX-0005vi-00 event smtp:connect
-1999-03-02 09:44:33 10HmaX-0005vi-00 event smtp:ehlo
-1999-03-02 09:44:33 10HmaX-0005vi-00 event tcp:close
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** rmt_reject@??? R=r2 T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rmt_reject@???>: 550 Administrative prohibition
-1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:fail:delivery
-1999-03-02 09:44:33 10HmaX-0005vi-00 rmt_reject@???: error ignored: RFC 3461 DSN, failure notify not requested
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:complete
-1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 accept/success
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaY-0005vi-00 event tcp:connect
-1999-03-02 09:44:33 10HmaY-0005vi-00 event smtp:connect
-1999-03-02 09:44:33 10HmaY-0005vi-00 event smtp:ehlo
-1999-03-02 09:44:33 10HmaY-0005vi-00 event tcp:close
-1999-03-02 09:44:33 10HmaY-0005vi-00 => rmt_accept@??? R=r2 T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 event msg:delivery
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 event msg:complete
-1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => rmt_accept <rmt_accept@???> R=r1 T=tofile
-1999-03-02 09:44:33 10HmaZ-0005vi-00 event msg:delivery
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss for b@???
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 event msg:complete
-1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <b@???> R=r_dump
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 event msg:complete
-1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 defer/delay
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmbB-0005vi-00 event tcp:connect
-1999-03-02 09:44:33 10HmbB-0005vi-00 event smtp:connect
-1999-03-02 09:44:33 10HmbB-0005vi-00 event smtp:ehlo
-1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:rcpt:host:defer
-1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:rcpt:defer
-1999-03-02 09:44:33 10HmbB-0005vi-00 event tcp:close
-1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@??? R=r2 T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rmt_defer@???>: 451 Temporary local problem - please try later
-1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 defer/never
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@??? routing defer (-52): retry time not reached
-1999-03-02 09:44:33 10HmbC-0005vi-00 event tcp:connect
-1999-03-02 09:44:33 10HmbC-0005vi-00 event smtp:connect
-1999-03-02 09:44:33 10HmbC-0005vi-00 event smtp:ehlo
-1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:rcpt:host:defer
-1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:rcpt:defer
-1999-03-02 09:44:33 10HmbC-0005vi-00 event tcp:close
-1999-03-02 09:44:33 10HmbC-0005vi-00 == rmt_defer@??? R=r2 T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rmt_defer@???>: 451 Temporary local problem - please try later
-1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 playout
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@??? routing defer (-52): retry time not reached
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss for c@???
-1999-03-02 09:44:33 10HmbC-0005vi-00 == rmt_defer@??? routing defer (-52): retry time not reached
-1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:fail:internal
-1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:complete
-1999-03-02 09:44:33 10HmbB-0005vi-00 removed by CALLER
-1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:fail:internal
-1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:complete
-1999-03-02 09:44:33 10HmbC-0005vi-00 removed by CALLER
-1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 rej/failure+delay
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmbD-0005vi-00 => :blackhole: <c@???> R=r_dump
-1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbD-0005vi-00 event msg:complete
-1999-03-02 09:44:33 10HmbE-0005vi-00 event tcp:connect
-1999-03-02 09:44:33 10HmbE-0005vi-00 event smtp:connect
-1999-03-02 09:44:33 10HmbE-0005vi-00 event smtp:ehlo
-1999-03-02 09:44:33 10HmbE-0005vi-00 event tcp:close
-1999-03-02 09:44:33 10HmbE-0005vi-00 ** rmt_reject@??? R=r2 T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rmt_reject@???>: 550 Administrative prohibition
-1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=EXIMUSER P=local S=sss for e@???
-1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbE-0005vi-00 event msg:complete
-1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 deliver DSN
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmbF-0005vi-00 => :blackhole: <e@???> R=r_dump
-1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbF-0005vi-00 event msg:complete
-1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
******** 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 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@??? H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_reject@???
-1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<a@???> rejected RCPT <rmt_reject@???>
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= b@??? H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_accept@???
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@??? H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss for rmt_accept@???
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= c@??? H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_defer@???
-1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<c@???> temporarily rejected RCPT <rmt_defer@???>
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= d@??? H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_defer@???
-1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<d@???> temporarily rejected RCPT <rmt_defer@???>
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= e@??? H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_reject@???
-1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<e@???> rejected RCPT <rmt_reject@???>
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= a@??? H=(tester) [127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@??? H=(tester) [127.0.0.1] P=smtp S=sss
diff --git a/test/log/0619 b/test/log/0619
index 36354ac..bbfa98d 100644
--- a/test/log/0619
+++ b/test/log/0619
@@ -1,10 +1,19 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss id=original1235@??? for a@???
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for b@???
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss id*=E10HmaZ-0005vi-00@??? for c@???
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss id=original1235@??? for d@???
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@???: Unrouteable address
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 ** b@???: Unrouteable address
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss id*=E10HmbC-0005vi-00@??? for CALLER@???
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 U=CALLER F=<testclient@???> rejected RCPT <a@???>
+1999-03-02 09:44:33 domain plainstring.ex
+1999-03-02 09:44:33 value plainstring.ex
+1999-03-02 09:44:33 $0 'plainstring.ex' $1 ''
+1999-03-02 09:44:33 domain headtail.ex
+1999-03-02 09:44:33 value *tail.ex
+1999-03-02 09:44:33 $0 'headtail.ex' $1 'head'
+1999-03-02 09:44:33 domain headregextail.ex
+1999-03-02 09:44:33 value ^.*r(e.)ex
+1999-03-02 09:44:33 $0 'headregextail.ex' $1 'eg'
+1999-03-02 09:44:33 domain primaryhostname.ex
+1999-03-02 09:44:33 value primaryhostname.ex
+1999-03-02 09:44:33 $0 'primaryhostname.ex' $1 ''
+1999-03-02 09:44:33 domain [127.0.0.1]
+1999-03-02 09:44:33 value @[]
+1999-03-02 09:44:33 $0 '[127.0.0.1]' $1 ''
+1999-03-02 09:44:33 domain mx46.test.ex
+1999-03-02 09:44:33 value @mx_any/ignore=1.1.1.1
+1999-03-02 09:44:33 $0 '46.test.ex' $1 ''
diff --git a/test/log/0620 b/test/log/0620
index 8f37c5f..3cd4ee1 100644
--- a/test/log/0620
+++ b/test/log/0620
@@ -1,3 +1,6 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 => b <a@???> R=user T=local_delivery
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 domain trythiskey.ex
+1999-03-02 09:44:33 value has this data
+1999-03-02 09:44:33 $0 'trythiskey.ex' $1 ''
+1999-03-02 09:44:33 domain trythiskey.ex
+1999-03-02 09:44:33 value trythiskey.ex
+1999-03-02 09:44:33 $0 'trythiskey.ex' $1 ''
diff --git a/test/log/0622 b/test/log/0622
deleted file mode 100644
index c5a9ef2..0000000
--- a/test/log/0622
+++ /dev/null
@@ -1,74 +0,0 @@
-2017-07-30 18:51:05.712 10HmbC-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for a@???
-2017-07-30 18:51:05.712 10HmbC-0005vi-00 ** a@???: Unrouteable address
-2017-07-30 18:51:05.712 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-2017-07-30 18:51:05.712 10HmbD-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
-2017-07-30 18:51:05.712 10HmbD-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbC-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbE-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for b@???
-2017-07-30 18:51:05.712 10HmbE-0005vi-00 ** b@???: Unrouteable address
-2017-07-30 18:51:05.712 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-2017-07-30 18:51:05.712 10HmbF-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
-2017-07-30 18:51:05.712 10HmbF-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbE-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for c@???
-2017-07-30 18:51:05.712 10HmaX-0005vi-00 ** c@???: Unrouteable address
-2017-07-30 18:51:05.712 10HmaX-0005vi-00 Failed to open TESTSUITE/aux-fixed/0622.nonexist.tmpl for error message texts: No such file or directory
-2017-07-30 18:51:05.712 10HmbG-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-2017-07-30 18:51:05.712 10HmbG-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
-2017-07-30 18:51:05.712 10HmbG-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmaX-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for d@???
-2017-07-30 18:51:05.712 10HmaY-0005vi-00 ** d@???: Unrouteable address
-2017-07-30 18:51:05.712 10HmaY-0005vi-00 bounce_message_file is not absolute after expansion: 'relative_file_path'
-
-2017-07-30 18:51:05.712 10HmbH-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-2017-07-30 18:51:05.712 10HmbH-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
-2017-07-30 18:51:05.712 10HmbH-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmaY-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for e@???
-2017-07-30 18:51:05.712 10HmaZ-0005vi-00 ** e@???: Unrouteable address
-2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Failed to expand bounce_message_file: '$acl_m_unset'
-
-2017-07-30 18:51:05.712 10HmbI-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-2017-07-30 18:51:05.712 10HmbI-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
-2017-07-30 18:51:05.712 10HmbI-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for f@???
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 ** f@???: Unrouteable address
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0622.CALLER@???'
-
-2017-07-30 18:51:05.712 10HmbJ-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-2017-07-30 18:51:05.712 10HmbJ-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
-2017-07-30 18:51:05.712 10HmbJ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbK-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for g@???
-2017-07-30 18:51:05.712 10HmbK-0005vi-00 ** g@???: Unrouteable address
-2017-07-30 18:51:05.712 10HmbL-0005vi-00 <= <> R=10HmbK-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-2017-07-30 18:51:05.712 10HmbL-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
-2017-07-30 18:51:05.712 10HmbL-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbK-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbM-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for delay_p@???
-2017-07-30 18:51:05.712 10HmbM-0005vi-00 == delay_p@??? R=delay defer (-1): deliberate for test purposes
-2017-07-30 18:51:05.712 10HmbN-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for delay_q@???
-2017-07-30 18:51:05.712 10HmbN-0005vi-00 == delay_q@??? R=delay defer (-1): deliberate for test purposes
-2017-07-30 18:51:05.712 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for delay_r@???
-2017-07-30 18:51:05.712 10HmbB-0005vi-00 == delay_r@??? R=delay defer (-1): deliberate for test purposes
-2017-07-30 18:51:05.712 10HmbO-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for delay_s@???
-2017-07-30 18:51:05.712 10HmbO-0005vi-00 == delay_s@??? R=delay defer (-1): deliberate for test purposes
-2017-07-30 18:51:05.712 10HmbM-0005vi-00 == delay_p@??? R=delay defer (-1): deliberate for test purposes
-2017-07-30 18:51:05.712 10HmbP-0005vi-00 <= <> R=10HmbM-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-2017-07-30 18:51:05.712 10HmbP-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
-2017-07-30 18:51:05.712 10HmbP-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbN-0005vi-00 == delay_q@??? R=delay defer (-1): deliberate for test purposes
-2017-07-30 18:51:05.712 10HmbQ-0005vi-00 <= <> R=10HmbN-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-2017-07-30 18:51:05.712 10HmbQ-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
-2017-07-30 18:51:05.712 10HmbQ-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbB-0005vi-00 == delay_r@??? R=delay defer (-1): deliberate for test purposes
-2017-07-30 18:51:05.712 10HmbB-0005vi-00 Failed to open TESTSUITE/aux-fixed/0622.nonexist.tmpl for warning message texts: No such file or directory
-2017-07-30 18:51:05.712 10HmbR-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-2017-07-30 18:51:05.712 10HmbR-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
-2017-07-30 18:51:05.712 10HmbR-0005vi-00 Completed
-2017-07-30 18:51:05.712 10HmbO-0005vi-00 == delay_s@??? R=delay defer (-1): deliberate for test purposes
-2017-07-30 18:51:05.712 10HmbS-0005vi-00 <= <> R=10HmbO-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@???
-2017-07-30 18:51:05.712 10HmbS-0005vi-00 => CALLER <CALLER@???> R=bounces T=savebounce
-2017-07-30 18:51:05.712 10HmbS-0005vi-00 Completed
diff --git a/test/log/0623 b/test/log/0623
deleted file mode 100644
index c84f874..0000000
--- a/test/log/0623
+++ /dev/null
@@ -1,6 +0,0 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
-
-******** SERVER ********
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= a@??? H=(tester) [127.0.0.1] P=smtp S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@??? H=(tester) [127.0.0.1] P=smtp S=sss
diff --git a/test/log/0624 b/test/log/0624
deleted file mode 100644
index bbfa98d..0000000
--- a/test/log/0624
+++ /dev/null
@@ -1,19 +0,0 @@
-1999-03-02 09:44:33 U=CALLER F=<testclient@???> rejected RCPT <a@???>
-1999-03-02 09:44:33 domain plainstring.ex
-1999-03-02 09:44:33 value plainstring.ex
-1999-03-02 09:44:33 $0 'plainstring.ex' $1 ''
-1999-03-02 09:44:33 domain headtail.ex
-1999-03-02 09:44:33 value *tail.ex
-1999-03-02 09:44:33 $0 'headtail.ex' $1 'head'
-1999-03-02 09:44:33 domain headregextail.ex
-1999-03-02 09:44:33 value ^.*r(e.)ex
-1999-03-02 09:44:33 $0 'headregextail.ex' $1 'eg'
-1999-03-02 09:44:33 domain primaryhostname.ex
-1999-03-02 09:44:33 value primaryhostname.ex
-1999-03-02 09:44:33 $0 'primaryhostname.ex' $1 ''
-1999-03-02 09:44:33 domain [127.0.0.1]
-1999-03-02 09:44:33 value @[]
-1999-03-02 09:44:33 $0 '[127.0.0.1]' $1 ''
-1999-03-02 09:44:33 domain mx46.test.ex
-1999-03-02 09:44:33 value @mx_any/ignore=1.1.1.1
-1999-03-02 09:44:33 $0 '46.test.ex' $1 ''
diff --git a/test/log/0625 b/test/log/0625
deleted file mode 100644
index 3cd4ee1..0000000
--- a/test/log/0625
+++ /dev/null
@@ -1,6 +0,0 @@
-1999-03-02 09:44:33 domain trythiskey.ex
-1999-03-02 09:44:33 value has this data
-1999-03-02 09:44:33 $0 'trythiskey.ex' $1 ''
-1999-03-02 09:44:33 domain trythiskey.ex
-1999-03-02 09:44:33 value trythiskey.ex
-1999-03-02 09:44:33 $0 'trythiskey.ex' $1 ''
diff --git a/test/mail/0620.b b/test/mail/0606.b
similarity index 100%
rename from test/mail/0620.b
rename to test/mail/0606.b
diff --git a/test/mail/0622.bounce_message b/test/mail/0608.bounce_message
similarity index 100%
rename from test/mail/0622.bounce_message
rename to test/mail/0608.bounce_message
diff --git a/test/mail/0618.rmt_accept b/test/mail/0612.rmt_accept
similarity index 100%
rename from test/mail/0618.rmt_accept
rename to test/mail/0612.rmt_accept
diff --git a/test/msglog/0593.10HmaX-0005vi-00 b/test/msglog/0593.10HmaX-0005vi-00
new file mode 100644
index 0000000..540b683
--- /dev/null
+++ b/test/msglog/0593.10HmaX-0005vi-00
@@ -0,0 +1,2 @@
+1999-03-02 09:44:33 Received from someone@??? U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 CALLER@??? R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/CALLER' (file or directory name for local_delivery transport) not permitted
diff --git a/test/msglog/0594.10HmaX-0005vi-00 b/test/msglog/0594.10HmaX-0005vi-00
new file mode 100644
index 0000000..f91a4a3
--- /dev/null
+++ b/test/msglog/0594.10HmaX-0005vi-00
@@ -0,0 +1,2 @@
+1999-03-02 09:44:33 Received from CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 |TESTSUITE/bin/iefbr14 <pipe-userx=TESTSUITE/bin/iefbr14@???> R=r2 T=t2 defer (0): Tainted 'TESTSUITE/bin/iefbr14' (command for t2 transport) not permitted
diff --git a/test/paniclog/0584 b/test/paniclog/0593
similarity index 100%
copy from test/paniclog/0584
copy to test/paniclog/0593
diff --git a/test/paniclog/0585 b/test/paniclog/0594
similarity index 100%
copy from test/paniclog/0585
copy to test/paniclog/0594
diff --git a/test/paniclog/0622 b/test/paniclog/0608
similarity index 70%
rename from test/paniclog/0622
rename to test/paniclog/0608
index 544d65c..0cf96cf 100644
--- a/test/paniclog/0622
+++ b/test/paniclog/0608
@@ -1,8 +1,8 @@
-2017-07-30 18:51:05.712 10HmaX-0005vi-00 Failed to open TESTSUITE/aux-fixed/0622.nonexist.tmpl for error message texts: No such file or directory
+2017-07-30 18:51:05.712 10HmaX-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for error message texts: No such file or directory
2017-07-30 18:51:05.712 10HmaY-0005vi-00 bounce_message_file is not absolute after expansion: 'relative_file_path'
2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Failed to expand bounce_message_file: '$acl_m_unset'
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0622.CALLER@???'
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@???'
-2017-07-30 18:51:05.712 10HmbB-0005vi-00 Failed to open TESTSUITE/aux-fixed/0622.nonexist.tmpl for warning message texts: No such file or directory
+2017-07-30 18:51:05.712 10HmbB-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for warning message texts: No such file or directory
diff --git a/test/rejectlog/0583 b/test/rejectlog/0583
index 993bc45..432b678 100644
--- a/test/rejectlog/0583
+++ b/test/rejectlog/0583
@@ -1,36 +1,6 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: bcc recipient detected
-Envelope-from: <CALLER@???>
-Envelope-to: <userx@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaX-0005vi-00
- for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
-T To: b@???, himself <usery@???>
-I Message-Id: <E10HmaX-0005vi-00@???>
-F From: CALLER_NAME <CALLER@???>
- Date: Tue, 2 Mar 1999 09:44:33 +0000
-1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: bcc recipient detected
-Envelope-from: <CALLER@???>
-Envelope-to: <userx@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaY-0005vi-00
- for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
-T To: c@???, himself <usery@???>
-I Message-Id: <E10HmaY-0005vi-00@???>
-F From: CALLER_NAME <CALLER@???>
- Date: Tue, 2 Mar 1999 09:44:33 +0000
-1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@???> rejected after DATA: bcc recipient detected
-Envelope-from: <CALLER@???>
-Envelope-to: <userx@???>
- <usery@???>
- <userz@???>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
- (envelope-from <CALLER@???>)
- id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-T To: e@???, himself <UserY@???>
-* Cc: unqualified, UserX@???, x@???
-C Cc: unqualified@???, UserX@???, x@???
-I Message-Id: <E10HmaZ-0005vi-00@???>
-F From: CALLER_NAME <CALLER@???>
- Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+******** SERVER ********
+2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<b@???> rejected RCPT <quota_fail@???>: Over quota
+2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<c@???> rejected RCPT <route_fail@???>: Unrouteable address
+2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<e@???> rejected RCPT <quota_fail@???>: Previous (cached) quota verification failure
+2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<f@???> rejected RCPT <route_fail@???>: Unrouteable address
diff --git a/test/rejectlog/0583 b/test/rejectlog/0585
similarity index 100%
copy from test/rejectlog/0583
copy to test/rejectlog/0585
diff --git a/test/rejectlog/0589 b/test/rejectlog/0589
deleted file mode 100644
index 432b678..0000000
--- a/test/rejectlog/0589
+++ /dev/null
@@ -1,6 +0,0 @@
-
-******** SERVER ********
-2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<b@???> rejected RCPT <quota_fail@???>: Over quota
-2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<c@???> rejected RCPT <route_fail@???>: Unrouteable address
-2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<e@???> rejected RCPT <quota_fail@???>: Previous (cached) quota verification failure
-2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<f@???> rejected RCPT <route_fail@???>: Unrouteable address
diff --git a/test/rejectlog/0618 b/test/rejectlog/0612
similarity index 100%
rename from test/rejectlog/0618
rename to test/rejectlog/0612
diff --git a/test/rejectlog/0619 b/test/rejectlog/0619
new file mode 100644
index 0000000..86b0ed7
--- /dev/null
+++ b/test/rejectlog/0619
@@ -0,0 +1 @@
+1999-03-02 09:44:33 U=CALLER F=<testclient@???> rejected RCPT <a@???>
diff --git a/test/scripts/0000-Basic/0583 b/test/scripts/0000-Basic/0583
index c4ae477..8cea367 100644
--- a/test/scripts/0000-Basic/0583
+++ b/test/scripts/0000-Basic/0583
@@ -1,65 +1,44 @@
-# verify = not_blind/case_insensitive
+# verify quota at smtp time
#
-# Accept: the env rcpt matches a header To:
-exim -odq -bs
-mail from:<>
-rcpt to:<userx@???>
-data
-To: a@???, himself <UserX@???>
-.
-quit
+exim -bd -DSERVER=server -oX PORT_D
****
-### Reject: no match
-exim -odq -bs
-mail from:<>
-rcpt to:<userx@???>
-data
-To: b@???, himself <usery@???>
-.
-quit
+client 127.0.0.1 PORT_D
+??? 220
+EHLO test
+??? 250-
+??? 250-SIZE
+??? 250-8BITMIME
+??? 250-PIPELINING
+??? 250 HELP
+MAIL FROM:<a@???>\r\nRCPT TO:<quota_good@???>
+??? 250
+??? 250
+RSET
+??? 250
+MAIL FROM:<b@???> SIZE=2048\r\nRCPT TO:<quota_fail@???>
+??? 250
+??? 550
+RSET
+??? 250
+MAIL FROM:<c@???>\r\nRCPT TO:<route_fail@???>
+??? 250
+??? 550
+RSET
+??? 250
+MAIL FROM:<d@???>\r\nRCPT TO:<quota_good@???>
+??? 250
+??? 250
+RSET
+??? 250
+MAIL FROM:<e@???> SIZE=512\r\nRCPT TO:<quota_fail@???>
+??? 250
+??? 550
+RSET
+??? 250
+MAIL FROM:<f@???>\r\nRCPT TO:<route_fail@???>
+??? 250
+??? 550
+QUIT
****
-### Reject, with specific SMTP message
-exim -DERROR_DETAILS=smtp_return_error_details -odq -bs
-mail from:<>
-rcpt to:<userx@???>
-data
-To: c@???, himself <usery@???>
-.
-quit
-****
-### Accept, matches in header CC:
-exim -odq -bs
-mail from:<>
-rcpt to:<userx@???>
-rcpt to:<usery@???>
-data
-To: d@???, himself <UserY@???>
-Cc: unqualified, UserX@???, x@???
-.
-quit
-****
-### Reject: To: & CC: combo, an env rcpt missing
-exim -odq -bs
-mail from:<>
-rcpt to:<userx@???>
-rcpt to:<usery@???>
-rcpt to:<userz@???>
-data
-To: e@???, himself <UserY@???>
-Cc: unqualified, UserX@???, x@???
-.
-quit
-****
-### Accept: Resent-To: & Resent-CC: combo
-exim -odq -bs
-mail from:<>
-rcpt to:<userx@???>
-rcpt to:<usery@???>
-data
-Resent-To: f@???, himself <UserY@???>
-Resent-Cc: unqualified, UserX@???, x@???
-To: an@other
-.
-quit
-****
-no_msglog_check
+#
+killdaemon
diff --git a/test/scripts/0000-Basic/0584 b/test/scripts/0000-Basic/0584
index 54ca506..c7f543d 100644
--- a/test/scripts/0000-Basic/0584
+++ b/test/scripts/0000-Basic/0584
@@ -1,8 +1,29 @@
-# tainted data for appendfile file option
-exim -bs -odi
-mail from:someone@???
-rcpt to:CALLER@HOSTNAME
+# verify = sender=address
+#
+# pass
+exim -DOPT=userx@??? -bh 127.0.0.1
+mail from:<userx@???>
+rcpt to:<userx@???>
data
+From: userx@???
+Subject: testing
.
-quit
+QUIT
****
+# fail
+exim -DOPT=fail@??? -bh 127.0.0.1
+mail from:<userx@???>
+rcpt to:<userx@???>
+QUIT
+****
+# check can use tainted data
+exim -DOPT='$sender_address/defer_ok' -bh 127.0.0.1
+mail from:<userx@???>
+rcpt to:<userx@???>
+data
+From: userx@???
+Subject: testing
+.
+QUIT
+****
+no_msglog_check
diff --git a/test/scripts/0000-Basic/0585 b/test/scripts/0000-Basic/0585
index 5fbc931..c4ae477 100644
--- a/test/scripts/0000-Basic/0585
+++ b/test/scripts/0000-Basic/0585
@@ -1,4 +1,65 @@
-# tainted data for pipe transport command
-exim -odi pipe-userx=DIR/bin/iefbr14@???
-A test message.
+# verify = not_blind/case_insensitive
+#
+# Accept: the env rcpt matches a header To:
+exim -odq -bs
+mail from:<>
+rcpt to:<userx@???>
+data
+To: a@???, himself <UserX@???>
+.
+quit
****
+### Reject: no match
+exim -odq -bs
+mail from:<>
+rcpt to:<userx@???>
+data
+To: b@???, himself <usery@???>
+.
+quit
+****
+### Reject, with specific SMTP message
+exim -DERROR_DETAILS=smtp_return_error_details -odq -bs
+mail from:<>
+rcpt to:<userx@???>
+data
+To: c@???, himself <usery@???>
+.
+quit
+****
+### Accept, matches in header CC:
+exim -odq -bs
+mail from:<>
+rcpt to:<userx@???>
+rcpt to:<usery@???>
+data
+To: d@???, himself <UserY@???>
+Cc: unqualified, UserX@???, x@???
+.
+quit
+****
+### Reject: To: & CC: combo, an env rcpt missing
+exim -odq -bs
+mail from:<>
+rcpt to:<userx@???>
+rcpt to:<usery@???>
+rcpt to:<userz@???>
+data
+To: e@???, himself <UserY@???>
+Cc: unqualified, UserX@???, x@???
+.
+quit
+****
+### Accept: Resent-To: & Resent-CC: combo
+exim -odq -bs
+mail from:<>
+rcpt to:<userx@???>
+rcpt to:<usery@???>
+data
+Resent-To: f@???, himself <UserY@???>
+Resent-Cc: unqualified, UserX@???, x@???
+To: an@other
+.
+quit
+****
+no_msglog_check
diff --git a/test/scripts/0000-Basic/0586 b/test/scripts/0000-Basic/0586
index 0e48328..1715fd2 100644
--- a/test/scripts/0000-Basic/0586
+++ b/test/scripts/0000-Basic/0586
@@ -1,4 +1,20 @@
-# tainted data for filter filename
-1
-exim -bv abcd@???
+# HELO verify dnssec
+# Exim test configuration 0608
+#
+exim -DSERVER=server -bd -oX PORT_D
****
+#
+client 127.0.0.1 PORT_D
+??? 220
+HELO localhost
+??? 250
+****
+#
+client 127.0.0.1 PORT_D
+??? 220
+HELO l-sec
+??? 250
+****
+#
+killdaemon
+no_msglog_check
diff --git a/test/scripts/0000-Basic/0587 b/test/scripts/0000-Basic/0587
index 038254e..6250131 100644
--- a/test/scripts/0000-Basic/0587
+++ b/test/scripts/0000-Basic/0587
@@ -1,19 +1,11 @@
-# $local_part_data, multi-rcpt message
+# dns retry in hostlist
+# Exim test configuration 0605
#
-exim -bs -odi
-mail from:<someone@???>
-rcpt to:<CALLER@HOSTNAME>
-rcpt to:<b@remote>
-data
-.
-quit
-****
-exim -bs -odi
-mail from:<someone@???>
-rcpt to:<a@remote>
-rcpt to:<CALLER@HOSTNAME>
-data
-.
+need_ipv4
+#
+exim -bh HOSTIPV4
+helo test
+mail from:<ralph@???>
+rcpt to:<bob@???>
quit
****
-no_message_check
diff --git a/test/scripts/0000-Basic/0588 b/test/scripts/0000-Basic/0588
index 44328a7..6899784 100644
--- a/test/scripts/0000-Basic/0588
+++ b/test/scripts/0000-Basic/0588
@@ -1,45 +1,19 @@
-# message_linelength_limit
+# dns log long lookups
+# Exim test configuration 0606
#
-# The "write" script cmd subtracts 1 for the newline,
-# and the linecount in exim doesn't count the line-ending.
-write test-data-good 1x999
-++++
-****
-write test-data-bad 1x1000
-++++
-****
+munge delay_1500
#
-exim -bd -DSERVER=server -oX PORT_D
-****
-client 127.0.0.1 PORT_D
-??? 220
-HELO test
-??? 250
-MAIL FROM:<CALLER@???>
-??? 250
-RCPT TO:<good@???>
-??? 250
-DATA
-??? 354
-Subject: should be good
-
-<<< test-data-good
-.
-??? 250
-MAIL FROM:<CALLER@???>
-??? 250
-RCPT TO:<bad@???>
-??? 250
-DATA
-??? 354
-Subject: should be bad
-
-<<< test-data-bad
-.
-??? 250
-QUIT
-??? 221
+exim -bh 127.0.0.1
+helo test
+mail from:<ralph@???>
+rcpt to:<should_log@???>
+quit
****
#
-sleep 1
-killdaemon
+#
+exim -bh 127.0.0.1
+helo test
+mail from:<ralph@???>
+rcpt to:<should_not_log@???>
+quit
+****
diff --git a/test/scripts/0000-Basic/0589 b/test/scripts/0000-Basic/0589
index 8cea367..44328a7 100644
--- a/test/scripts/0000-Basic/0589
+++ b/test/scripts/0000-Basic/0589
@@ -1,44 +1,45 @@
-# verify quota at smtp time
+# message_linelength_limit
+#
+# The "write" script cmd subtracts 1 for the newline,
+# and the linecount in exim doesn't count the line-ending.
+write test-data-good 1x999
+++++
+****
+write test-data-bad 1x1000
+++++
+****
#
exim -bd -DSERVER=server -oX PORT_D
****
client 127.0.0.1 PORT_D
??? 220
-EHLO test
-??? 250-
-??? 250-SIZE
-??? 250-8BITMIME
-??? 250-PIPELINING
-??? 250 HELP
-MAIL FROM:<a@???>\r\nRCPT TO:<quota_good@???>
-??? 250
-??? 250
-RSET
-??? 250
-MAIL FROM:<b@???> SIZE=2048\r\nRCPT TO:<quota_fail@???>
-??? 250
-??? 550
-RSET
-??? 250
-MAIL FROM:<c@???>\r\nRCPT TO:<route_fail@???>
-??? 250
-??? 550
-RSET
+HELO test
??? 250
-MAIL FROM:<d@???>\r\nRCPT TO:<quota_good@???>
+MAIL FROM:<CALLER@???>
??? 250
+RCPT TO:<good@???>
??? 250
-RSET
+DATA
+??? 354
+Subject: should be good
+
+<<< test-data-good
+.
??? 250
-MAIL FROM:<e@???> SIZE=512\r\nRCPT TO:<quota_fail@???>
+MAIL FROM:<CALLER@???>
??? 250
-??? 550
-RSET
+RCPT TO:<bad@???>
??? 250
-MAIL FROM:<f@???>\r\nRCPT TO:<route_fail@???>
+DATA
+??? 354
+Subject: should be bad
+
+<<< test-data-bad
+.
??? 250
-??? 550
QUIT
+??? 221
****
#
+sleep 1
killdaemon
diff --git a/test/scripts/0000-Basic/0591 b/test/scripts/0000-Basic/0591
deleted file mode 100644
index c7f543d..0000000
--- a/test/scripts/0000-Basic/0591
+++ /dev/null
@@ -1,29 +0,0 @@
-# verify = sender=address
-#
-# pass
-exim -DOPT=userx@??? -bh 127.0.0.1
-mail from:<userx@???>
-rcpt to:<userx@???>
-data
-From: userx@???
-Subject: testing
-.
-QUIT
-****
-# fail
-exim -DOPT=fail@??? -bh 127.0.0.1
-mail from:<userx@???>
-rcpt to:<userx@???>
-QUIT
-****
-# check can use tainted data
-exim -DOPT='$sender_address/defer_ok' -bh 127.0.0.1
-mail from:<userx@???>
-rcpt to:<userx@???>
-data
-From: userx@???
-Subject: testing
-.
-QUIT
-****
-no_msglog_check
diff --git a/test/scripts/0000-Basic/0584 b/test/scripts/0000-Basic/0593
similarity index 100%
copy from test/scripts/0000-Basic/0584
copy to test/scripts/0000-Basic/0593
diff --git a/test/scripts/0000-Basic/0585 b/test/scripts/0000-Basic/0594
similarity index 100%
copy from test/scripts/0000-Basic/0585
copy to test/scripts/0000-Basic/0594
diff --git a/test/scripts/0000-Basic/0586 b/test/scripts/0000-Basic/0595
similarity index 100%
copy from test/scripts/0000-Basic/0586
copy to test/scripts/0000-Basic/0595
diff --git a/test/scripts/0000-Basic/0587 b/test/scripts/0000-Basic/0596
similarity index 100%
copy from test/scripts/0000-Basic/0587
copy to test/scripts/0000-Basic/0596
diff --git a/test/scripts/0000-Basic/0599 b/test/scripts/0000-Basic/0597
similarity index 100%
copy from test/scripts/0000-Basic/0599
copy to test/scripts/0000-Basic/0597
diff --git a/test/scripts/0000-Basic/0621 b/test/scripts/0000-Basic/0598
similarity index 100%
rename from test/scripts/0000-Basic/0621
rename to test/scripts/0000-Basic/0598
diff --git a/test/scripts/0000-Basic/0599 b/test/scripts/0000-Basic/0599
index aa712de..360d536 100644
--- a/test/scripts/0000-Basic/0599
+++ b/test/scripts/0000-Basic/0599
@@ -1,76 +1,17 @@
-# control = queue/first_pass_route
+# udpsend
+#need_ipv4
#
-exim -bd -DSERVER=server -oX PORT_D
-****
#
-# First, control=queue_only - we expact the queue run to make separate connections
-client 127.0.0.1 PORT_D
-??? 220
-HELO me
-??? 250
-MAIL FROM:<CALLER@???>
-??? 250
-RCPT TO:<queue_only_1@???>
-??? 250
-DATA
-??? 354
-Subject: 1
-.
-??? 250
-RSET
-??? 250
-MAIL FROM:<CALLER@???>
-??? 250
-RCPT TO:<queue_only_2@???>
-??? 250
-DATA
-??? 354
-Subject: 2
-.
-??? 250
-QUIT
-****
-exim -q
-****
-exim -q
+perl aux-fixed/0601.udpserver
****
#
-# Second, control=queue/first_pass_route - we expect the queue run to make only one
-# connection, and put both messages over it
-client 127.0.0.1 PORT_D
-??? 220
-HELO me
-??? 250
-MAIL FROM:<CALLER@???>
-??? 250
-RCPT TO:<first_pass_route_1@???>
-??? 250
-DATA
-??? 354
-Subject: 1
+exim -bs -odi
+mail from:someone@???
+rcpt to:CALLER@HOSTNAME
+data
+This is a test message.
.
-??? 250
-RSET
-??? 250
-MAIL FROM:<CALLER@???>
-??? 250
-RCPT TO:<first_pass_route_2@???>
-??? 250
-DATA
-??? 354
-Subject: 2
-.
-??? 250
-QUIT
-****
-# give time for the background routing in the exim daemon to complete
-sleep 1
-# then run the queue
-exim -q
-****
-exim -q
+quit
****
-#
-#
-killdaemon
+sleep 2
no_msglog_check
diff --git a/test/scripts/0000-Basic/0601 b/test/scripts/0000-Basic/0601
index 360d536..5fcce7c 100644
--- a/test/scripts/0000-Basic/0601
+++ b/test/scripts/0000-Basic/0601
@@ -1,17 +1,109 @@
-# udpsend
-#need_ipv4
+# syslog logging
+#
+# basic
+exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=no -DARG2=no fred@???
+****
+# plus tz
+exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=no -DARG2=no fred@???
+****
+# plus ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=no -DARG2=no fred@???
+****
+# plus tz + ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=no -DARG2=no fred@???
+****
+# plus pid
+exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=no -DARG2=no fred@???
+****
+# plus pid + tz
+exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=no -DARG2=no fred@???
+****
+# plus pid + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=no -DARG2=no fred@???
+****
+# plus pid + tz + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=no -DARG2=no fred@???
+****
#
#
-perl aux-fixed/0601.udpserver
+# syslog plus pid
+# basic
+exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=no -DARG2=yes fred@???
+****
+# plus tz
+exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=no -DARG2=yes fred@???
+****
+# plus ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=no -DARG2=yes fred@???
+****
+# plus tz + ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=no -DARG2=yes fred@???
+****
+# plus pid
+exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=no -DARG2=yes fred@???
+****
+# plus pid + tz
+exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=no -DARG2=yes fred@???
+****
+# plus pid + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=no -DARG2=yes fred@???
+****
+# plus pid + tz + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=no -DARG2=yes fred@???
****
#
-exim -bs -odi
-mail from:someone@???
-rcpt to:CALLER@HOSTNAME
-data
-This is a test message.
-.
-quit
+#
+# syslog plus time
+# basic
+exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=yes -DARG2=no fred@???
+****
+# plus tz
+exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=yes -DARG2=no fred@???
****
-sleep 2
+# plus ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=yes -DARG2=no fred@???
+****
+# plus tz + ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=yes -DARG2=no fred@???
+****
+# plus pid
+exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=yes -DARG2=no fred@???
+****
+# plus pid + tz
+exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@???
+****
+# plus pid + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=yes -DARG2=no fred@???
+****
+# plus pid + tz + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@???
+****
+#
+#
+# syslog plus pid + time
+# basic
+exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=yes -DARG2=yes fred@???
+****
+# plus tz
+exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=yes -DARG2=yes fred@???
+****
+# plus ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=yes -DARG2=yes fred@???
+****
+# plus tz + ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=yes -DARG2=yes fred@???
+****
+# plus pid
+exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=yes -DARG2=yes fred@???
+****
+# plus pid + tz
+exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@???
+****
+# plus pid + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=yes -DARG2=yes fred@???
+****
+# plus pid + tz + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=yes -DARG2=yes fred@???
+****
+#
no_msglog_check
diff --git a/test/scripts/0000-Basic/0603 b/test/scripts/0000-Basic/0603
index 38e374a..dfe53ef 100644
--- a/test/scripts/0000-Basic/0603
+++ b/test/scripts/0000-Basic/0603
@@ -1,71 +1,10 @@
-# retry: transport identity depending on sender
-# Exim test configuration 0603
+# log_defer_output on pipe transport
#
-# Add several messages going to the same location
-# And change smtp output based on senders domain
+#XXX maybe collapse into 0048?
#
-exim -DSERVER=server -bd -oX PORT_D
-****
-#
-exim -bs
-mail from:ralph@???
-rcpt to:bob@???
-data
-This is a test message.
-It has three lines.
-This is the last line.
-.
-RSET
-mail from:peter@???
-rcpt to:bob@???
-data
-Subject: second
-
-This is a second test message.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: third
-Reply-to: some@body
-
-This is a third test message.
-.
-RSET
-mail from:peter@???
-rcpt to:bob@???
-data
-Subject: secondA
-
-This is a secondA test message.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: third
-Reply-to: some@body
-
-This is a fourth test message.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: third
-Reply-to: some@body
-
-This is a fifth test message.
-.
-quit
-****
+munge sys_bindir
#
-#
-exim -qq
+exim a
****
-#
-#
-killdaemon
+sleep 2
no_msglog_check
-
diff --git a/test/scripts/0000-Basic/0604 b/test/scripts/0000-Basic/0604
index a24d194..196b9dc 100644
--- a/test/scripts/0000-Basic/0604
+++ b/test/scripts/0000-Basic/0604
@@ -1,667 +1,45 @@
-# retry: database continuation record
-# Exim test configuration 0604
+# log_selector msg_id and msg_id_created
#
-echo Note this takes 3 minutes to run
-#
-exim -DSERVER=server -bd -oX PORT_D
+# msg_id is on by default; check baseline
+exim -DLOG_SELECTOR=+received_recipients -t
+From: CALLER@???
+To: a@???
+Message-ID: original1235@???
+
+body
****
#
-exim -bs
-mail from:ralph@???
-rcpt to:bob@???
-data
-This is a test message.
-It has three lines.
-This is the last line.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 1
-
-This is message number 1.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 2
-
-This is message number 2.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 3
-
-This is message number 3.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 4
-
-This is message number 4.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 5
-
-This is message number 5.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 6
-
-This is message number 6.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 7
-
-This is message number 7.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 8
-
-This is message number 8.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 9
-
-This is message number 9.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 10
-
-This is message number 10.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 11
-
-This is message number 11.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 12
-
-This is message number 12.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 13
-
-This is message number 13.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 14
-
-This is message number 14.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 15
-
-This is message number 15.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 16
-
-This is message number 16.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 17
-
-This is message number 17.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 18
-
-This is message number 18.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 19
-
-This is message number 19.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 20
-
-This is message number 20.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 21
-
-This is message number 21.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 22
-
-This is message number 22.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 23
-
-This is message number 23.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 24
-
-This is message number 24.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 25
-
-This is message number 25.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 26
-
-This is message number 26.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 27
-
-This is message number 27.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 28
-
-This is message number 28.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 29
-
-This is message number 29.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 30
-
-This is message number 30.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 31
-
-This is message number 31.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 32
-
-This is message number 32.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 33
-
-This is message number 33.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 34
-
-This is message number 34.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 35
-
-This is message number 35.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 36
-
-This is message number 36.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 37
-
-This is message number 37.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 38
-
-This is message number 38.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 39
-
-This is message number 39.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 40
-
-This is message number 40.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 41
-
-This is message number 41.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 42
-
-This is message number 42.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 43
-
-This is message number 43.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 44
-
-This is message number 44.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 45
-
-This is message number 45.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 46
-
-This is message number 46.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 47
-
-This is message number 47.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 48
-
-This is message number 48.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 49
-
-This is message number 49.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 50
-
-This is message number 50.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 51
-
-This is message number 51.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 52
-
-This is message number 52.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 53
-
-This is message number 53.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 54
-
-This is message number 54.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 55
-
-This is message number 55.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 56
-
-This is message number 56.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 57
-
-This is message number 57.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 58
-
-This is message number 58.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 59
-
-This is message number 59.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 60
-
-This is message number 60.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 61
-
-This is message number 61.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 62
-
-This is message number 62.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 63
-
-This is message number 63.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 64
-
-This is message number 64.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 65
-
-This is message number 65.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 66
-
-This is message number 66.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 67
-
-This is message number 67.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 68
-
-This is message number 68.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 69
-
-This is message number 69.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 70
-
-This is message number 70.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 71
-
-This is message number 71.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 72
-
-This is message number 72.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 73
-
-This is message number 73.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 74
-
-This is message number 74.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 75
-
-This is message number 75.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 76
-
-This is message number 76.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 77
-
-This is message number 77.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 78
-
-This is message number 78.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 79
-
-This is message number 79.
-.
-RSET
-mail from:ralph@???
-rcpt to:bob@???
-data
-Subject: message_id 80
-
-This is message number 80.
-.
-quit
+# msg_id is on by default; check it can be disabled
+exim -DLOG_SELECTOR=+received_recipients-msg_id -t
+From: CALLER@???
+To: b@???
+Message-ID: original1235@???
+
+body
****
#
+# check msg_id_created shows invented ones
+exim -DLOG_SELECTOR=+received_recipients+msg_id_created -t
+From: CALLER@???
+To: c@???
+
+body
+****
#
-exim -qq
+# check msg_id_created ignores non-invented ones
+exim -DLOG_SELECTOR=+received_recipients+msg_id_created -t
+From: CALLER@???
+To: d@???
+Message-ID: original1235@???
+
+body
****
#
+# check that bounces don't log created, by default
+exim -DLOG_SELECTOR=+received_recipients -M $msg1
+****
+# and check they do with msg_id_created
+exim -DLOG_SELECTOR=+received_recipients+msg_id_created -M $msg1
+****
#
-killdaemon
no_msglog_check
-
diff --git a/test/scripts/0000-Basic/0605 b/test/scripts/0000-Basic/0605
index 6250131..ff3931b 100644
--- a/test/scripts/0000-Basic/0605
+++ b/test/scripts/0000-Basic/0605
@@ -1,11 +1,17 @@
-# dns retry in hostlist
-# Exim test configuration 0605
+# hosts_connection_nolog versus sender_host lists caching
+exim -bd -DSERVER=server -oX PORT_D
+****
#
-need_ipv4
+# Will not log connection due to hosts_connection_nolog
+client 127.0.0.1 PORT_D
+??? 220
+QUIT
+****
#
-exim -bh HOSTIPV4
-helo test
-mail from:<ralph@???>
-rcpt to:<bob@???>
-quit
+# Connection should be logged
+client HOSTIPV4 PORT_D
+??? 220
+QUIT
****
+#
+killdaemon
diff --git a/test/scripts/0000-Basic/0606 b/test/scripts/0000-Basic/0606
index 6899784..96d5988 100644
--- a/test/scripts/0000-Basic/0606
+++ b/test/scripts/0000-Basic/0606
@@ -1,19 +1,6 @@
-# dns log long lookups
-# Exim test configuration 0606
-#
-munge delay_1500
-#
-exim -bh 127.0.0.1
-helo test
-mail from:<ralph@???>
-rcpt to:<should_log@???>
-quit
-****
-#
-#
-exim -bh 127.0.0.1
-helo test
-mail from:<ralph@???>
-rcpt to:<should_not_log@???>
-quit
+# router variables
+exim -odi a
+Subject: foo
+
+body
****
diff --git a/test/scripts/0000-Basic/0608 b/test/scripts/0000-Basic/0608
index 1715fd2..f3016f2 100644
--- a/test/scripts/0000-Basic/0608
+++ b/test/scripts/0000-Basic/0608
@@ -1,20 +1,49 @@
-# HELO verify dnssec
-# Exim test configuration 0608
+# bounce_message_file and warn_message_file
#
-exim -DSERVER=server -bd -oX PORT_D
+exim -odf a@???
+Subject: test 1.1 - Default deny message
****
-#
-client 127.0.0.1 PORT_D
-??? 220
-HELO localhost
-??? 250
+exim -odf -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl b@???
+Subject: test 1.2 - Specified deny message file
+****
+exim -odf -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl c@???
+Subject: test 1.3 - Specified, missing deny message file
+****
+exim -odf -DOPT=relative_file_path d@???
+Subject: test 1.4 - Specified, non-absolute
+****
+exim -odf -DOPT='$acl_m_unset' e@???
+Subject: test 1.5 - Specified, expansion empty
+****
+exim -odf -DOPT='DIR/aux-fixed/TESTNUM.$sender_address' f@???
+Subject: test 1.6 - Specified, expansion tainted
+****
+exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' g@???
+Subject: test 1.7 - Specified, expansion good
****
#
-client 127.0.0.1 PORT_D
-??? 220
-HELO l-sec
-??? 250
+exim -odf delay_p@???
+Subject: test 2.1 - Default delay message
+****
+exim -odf -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl delay_q@???
+Subject: test 2.2 - Specified delay message file
****
+exim -odf -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl delay_r@???
+Subject: test 2.3 - Specified, missing delay message file
+****
+exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' delay_s@???
+Subject: test 2.7 - Specified, expansion good
+****
+sleep 1
+exim -M $msg1
+****
+exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg2
+****
+exim -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl -M $msg3
+****
+exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg4
+****
+sleep 1
+#
#
-killdaemon
no_msglog_check
diff --git a/test/scripts/0000-Basic/0612 b/test/scripts/0000-Basic/0612
index dfe53ef..69a53c6 100644
--- a/test/scripts/0000-Basic/0612
+++ b/test/scripts/0000-Basic/0612
@@ -1,10 +1,180 @@
-# log_defer_output on pipe transport
+# DSN ESMTP extension RCPT options
#
-#XXX maybe collapse into 0048?
+# Server does not advertise by default
+exim -DSERVER=server -bd -oX PORT_D
+****
+client 127.0.0.1 PORT_D
+??? 220
+EHLO testclient
+??? 250-
+??? 250-SIZE
+??? 250 HELP
+****
+killdaemon
+#
+#
+# Server does advertise when told. Client requests no bounces, and this one gets a reject.
+exim -DSERVER=server -DOPT=y -bd -oX PORT_D
+****
+exim -z rej/never
+****
+client HOSTIPV4 PORT_D
+??? 220
+EHLO testclient
+??? 250-
+??? 250-SIZE
+??? 250-DSN
+??? 250 HELP
+MAIL FROM:<a@???>
+??? 250
+RCPT TO:<any@???> NOTIFY=foo
+??? 501
+RCPT TO:<rmt_reject@???> NOTIFY=never
+??? 250
+DATA
+??? 354
+Subject: test
+.
+??? 250
+QUIT
+??? 221
+****
+exim -q
+****
+#
+# Client requests delivery notification; the server supports DSN so takes responsibility
+exim -z accept/success
+****
+client HOSTIPV4 PORT_D
+??? 220
+EHLO testclient
+??? 250-
+??? 250-SIZE
+??? 250-DSN
+??? 250 HELP
+MAIL FROM:<b@???>
+??? 250
+RCPT TO:<rmt_accept@???> NOTIFY=success
+??? 250
+DATA
+??? 354
+Subject: test
+.
+??? 250
+QUIT
+??? 221
+****
+# MSA send msg to MDA
+exim -q
+****
+# deliver msg at MDA
+exim -q
+****
+# deliver notification from MDA
+exim -q
+****
+#
+# Client requests notification of deferral. First time of trying, we get
+# a defer but queue-time probably has not hit the 1st retry time yet, so no DSN
+# will be sent and the message remains queued. Then, claiming time has elapsed,
+# we will look again (expecting a delay-DSN to be produced). We won't see a
+# retry since the actual retry time has not passed.
+exim -z defer/delay
+****
+client HOSTIPV4 PORT_D
+??? 220
+EHLO testclient
+??? 250-
+??? 250-SIZE
+??? 250-DSN
+??? 250 HELP
+MAIL FROM:<c@???>
+??? 250
+RCPT TO:<rmt_defer@???> NOTIFY=delay
+??? 250
+DATA
+??? 354
+Subject: test
+.
+??? 250
+QUIT
+??? 221
+****
+exim -q
+****
#
-munge sys_bindir
+# Clients requests no DSNs, and this one gets deferred
+exim -z defer/never
+****
+client HOSTIPV4 PORT_D
+??? 220
+EHLO testclient
+??? 250-
+??? 250-SIZE
+??? 250-DSN
+??? 250 HELP
+MAIL FROM:<d@???>
+??? 250
+RCPT TO:<rmt_defer@???> NOTIFY=never
+??? 250
+DATA
+??? 354
+Subject: test
+.
+??? 250
+QUIT
+??? 221
+****
+exim -q
+****
+#
+#
+#
+# Second time, for the queued deferrals.
+# We should see the notify for c@??? but not d@???
+exim -z playout
+****
+exim -Tqt 10s/ -q
+****
+sleep 1
+exim -Mrm $msg1 $msg2
+****
#
-exim a
+#
+#
+#
+# Client requests bounce+delay notification; bounce happens
+exim -z rej/failure+delay
+****
+client HOSTIPV4 PORT_D
+??? 220
+EHLO testclient
+??? 250-
+??? 250-SIZE
+??? 250-DSN
+??? 250 HELP
+MAIL FROM:<e@???>
+??? 250
+RCPT TO:<rmt_reject@???> NOTIFY=fAiLuRe,DELAY
+??? 250
+DATA
+??? 354
+Subject: test
+.
+??? 250
+QUIT
+??? 221
+****
+# MSA send msg to MDA
+exim -q
****
-sleep 2
+# deliver notification from MDA
+exim -z 'deliver DSN'
+****
+exim -q
+****
+sleep 1
+killdaemon
+#
+#
no_msglog_check
diff --git a/test/scripts/0000-Basic/0614 b/test/scripts/0000-Basic/0614
index ff3931b..38e374a 100644
--- a/test/scripts/0000-Basic/0614
+++ b/test/scripts/0000-Basic/0614
@@ -1,17 +1,71 @@
-# hosts_connection_nolog versus sender_host lists caching
-exim -bd -DSERVER=server -oX PORT_D
+# retry: transport identity depending on sender
+# Exim test configuration 0603
+#
+# Add several messages going to the same location
+# And change smtp output based on senders domain
+#
+exim -DSERVER=server -bd -oX PORT_D
****
#
-# Will not log connection due to hosts_connection_nolog
-client 127.0.0.1 PORT_D
-??? 220
-QUIT
+exim -bs
+mail from:ralph@???
+rcpt to:bob@???
+data
+This is a test message.
+It has three lines.
+This is the last line.
+.
+RSET
+mail from:peter@???
+rcpt to:bob@???
+data
+Subject: second
+
+This is a second test message.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: third
+Reply-to: some@body
+
+This is a third test message.
+.
+RSET
+mail from:peter@???
+rcpt to:bob@???
+data
+Subject: secondA
+
+This is a secondA test message.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: third
+Reply-to: some@body
+
+This is a fourth test message.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: third
+Reply-to: some@body
+
+This is a fifth test message.
+.
+quit
****
#
-# Connection should be logged
-client HOSTIPV4 PORT_D
-??? 220
-QUIT
+#
+exim -qq
****
#
+#
killdaemon
+no_msglog_check
+
diff --git a/test/scripts/0000-Basic/0615 b/test/scripts/0000-Basic/0615
index 5fcce7c..a24d194 100644
--- a/test/scripts/0000-Basic/0615
+++ b/test/scripts/0000-Basic/0615
@@ -1,109 +1,667 @@
-# syslog logging
+# retry: database continuation record
+# Exim test configuration 0604
#
-# basic
-exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=no -DARG2=no fred@???
-****
-# plus tz
-exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=no -DARG2=no fred@???
-****
-# plus ms
-exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=no -DARG2=no fred@???
-****
-# plus tz + ms
-exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=no -DARG2=no fred@???
-****
-# plus pid
-exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=no -DARG2=no fred@???
-****
-# plus pid + tz
-exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=no -DARG2=no fred@???
-****
-# plus pid + ms
-exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=no -DARG2=no fred@???
-****
-# plus pid + tz + ms
-exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=no -DARG2=no fred@???
-****
+echo Note this takes 3 minutes to run
#
-#
-# syslog plus pid
-# basic
-exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=no -DARG2=yes fred@???
-****
-# plus tz
-exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=no -DARG2=yes fred@???
-****
-# plus ms
-exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=no -DARG2=yes fred@???
-****
-# plus tz + ms
-exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=no -DARG2=yes fred@???
-****
-# plus pid
-exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=no -DARG2=yes fred@???
-****
-# plus pid + tz
-exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=no -DARG2=yes fred@???
-****
-# plus pid + ms
-exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=no -DARG2=yes fred@???
-****
-# plus pid + tz + ms
-exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=no -DARG2=yes fred@???
+exim -DSERVER=server -bd -oX PORT_D
****
#
-#
-# syslog plus time
-# basic
-exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=yes -DARG2=no fred@???
-****
-# plus tz
-exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=yes -DARG2=no fred@???
-****
-# plus ms
-exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=yes -DARG2=no fred@???
-****
-# plus tz + ms
-exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=yes -DARG2=no fred@???
-****
-# plus pid
-exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=yes -DARG2=no fred@???
-****
-# plus pid + tz
-exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@???
-****
-# plus pid + ms
-exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=yes -DARG2=no fred@???
-****
-# plus pid + tz + ms
-exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@???
+exim -bs
+mail from:ralph@???
+rcpt to:bob@???
+data
+This is a test message.
+It has three lines.
+This is the last line.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 1
+
+This is message number 1.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 2
+
+This is message number 2.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 3
+
+This is message number 3.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 4
+
+This is message number 4.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 5
+
+This is message number 5.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 6
+
+This is message number 6.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 7
+
+This is message number 7.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 8
+
+This is message number 8.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 9
+
+This is message number 9.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 10
+
+This is message number 10.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 11
+
+This is message number 11.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 12
+
+This is message number 12.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 13
+
+This is message number 13.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 14
+
+This is message number 14.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 15
+
+This is message number 15.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 16
+
+This is message number 16.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 17
+
+This is message number 17.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 18
+
+This is message number 18.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 19
+
+This is message number 19.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 20
+
+This is message number 20.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 21
+
+This is message number 21.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 22
+
+This is message number 22.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 23
+
+This is message number 23.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 24
+
+This is message number 24.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 25
+
+This is message number 25.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 26
+
+This is message number 26.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 27
+
+This is message number 27.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 28
+
+This is message number 28.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 29
+
+This is message number 29.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 30
+
+This is message number 30.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 31
+
+This is message number 31.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 32
+
+This is message number 32.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 33
+
+This is message number 33.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 34
+
+This is message number 34.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 35
+
+This is message number 35.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 36
+
+This is message number 36.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 37
+
+This is message number 37.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 38
+
+This is message number 38.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 39
+
+This is message number 39.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 40
+
+This is message number 40.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 41
+
+This is message number 41.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 42
+
+This is message number 42.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 43
+
+This is message number 43.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 44
+
+This is message number 44.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 45
+
+This is message number 45.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 46
+
+This is message number 46.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 47
+
+This is message number 47.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 48
+
+This is message number 48.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 49
+
+This is message number 49.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 50
+
+This is message number 50.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 51
+
+This is message number 51.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 52
+
+This is message number 52.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 53
+
+This is message number 53.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 54
+
+This is message number 54.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 55
+
+This is message number 55.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 56
+
+This is message number 56.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 57
+
+This is message number 57.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 58
+
+This is message number 58.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 59
+
+This is message number 59.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 60
+
+This is message number 60.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 61
+
+This is message number 61.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 62
+
+This is message number 62.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 63
+
+This is message number 63.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 64
+
+This is message number 64.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 65
+
+This is message number 65.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 66
+
+This is message number 66.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 67
+
+This is message number 67.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 68
+
+This is message number 68.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 69
+
+This is message number 69.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 70
+
+This is message number 70.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 71
+
+This is message number 71.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 72
+
+This is message number 72.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 73
+
+This is message number 73.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 74
+
+This is message number 74.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 75
+
+This is message number 75.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 76
+
+This is message number 76.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 77
+
+This is message number 77.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 78
+
+This is message number 78.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 79
+
+This is message number 79.
+.
+RSET
+mail from:ralph@???
+rcpt to:bob@???
+data
+Subject: message_id 80
+
+This is message number 80.
+.
+quit
****
#
#
-# syslog plus pid + time
-# basic
-exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=yes -DARG2=yes fred@???
-****
-# plus tz
-exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=yes -DARG2=yes fred@???
-****
-# plus ms
-exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=yes -DARG2=yes fred@???
-****
-# plus tz + ms
-exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=yes -DARG2=yes fred@???
-****
-# plus pid
-exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=yes -DARG2=yes fred@???
-****
-# plus pid + tz
-exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@???
-****
-# plus pid + ms
-exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=yes -DARG2=yes fred@???
-****
-# plus pid + tz + ms
-exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=yes -DARG2=yes fred@???
+exim -qq
****
#
+#
+killdaemon
no_msglog_check
+
diff --git a/test/scripts/0000-Basic/0618 b/test/scripts/0000-Basic/0618
index 69a53c6..d43d13c 100644
--- a/test/scripts/0000-Basic/0618
+++ b/test/scripts/0000-Basic/0618
@@ -1,180 +1,57 @@
-# DSN ESMTP extension RCPT options
+# free of local_part_data, domain_data, sender_data
#
-# Server does not advertise by default
-exim -DSERVER=server -bd -oX PORT_D
-****
-client 127.0.0.1 PORT_D
-??? 220
-EHLO testclient
-??? 250-
-??? 250-SIZE
-??? 250 HELP
-****
-killdaemon
-#
-#
-# Server does advertise when told. Client requests no bounces, and this one gets a reject.
-exim -DSERVER=server -DOPT=y -bd -oX PORT_D
-****
-exim -z rej/never
-****
-client HOSTIPV4 PORT_D
-??? 220
-EHLO testclient
-??? 250-
-??? 250-SIZE
-??? 250-DSN
-??? 250 HELP
-MAIL FROM:<a@???>
-??? 250
-RCPT TO:<any@???> NOTIFY=foo
-??? 501
-RCPT TO:<rmt_reject@???> NOTIFY=never
-??? 250
+exim -bh 99.99.99.99
+HELO tester
+MAIL FROM:<a@???>
+RCPT TO:<fred@???>
DATA
-??? 354
-Subject: test
.
-??? 250
-QUIT
-??? 221
-****
-exim -q
-****
-#
-# Client requests delivery notification; the server supports DSN so takes responsibility
-exim -z accept/success
-****
-client HOSTIPV4 PORT_D
-??? 220
-EHLO testclient
-??? 250-
-??? 250-SIZE
-??? 250-DSN
-??? 250 HELP
-MAIL FROM:<b@???>
-??? 250
-RCPT TO:<rmt_accept@???> NOTIFY=success
-??? 250
+RSET
+MAIL FROM:<b@???>
+RCPT TO:<jim@???>
DATA
-??? 354
-Subject: test
.
-??? 250
QUIT
-??? 221
-****
-# MSA send msg to MDA
-exim -q
-****
-# deliver msg at MDA
-exim -q
-****
-# deliver notification from MDA
-exim -q
****
#
-# Client requests notification of deferral. First time of trying, we get
-# a defer but queue-time probably has not hit the 1st retry time yet, so no DSN
-# will be sent and the message remains queued. Then, claiming time has elapsed,
-# we will look again (expecting a delay-DSN to be produced). We won't see a
-# retry since the actual retry time has not passed.
-exim -z defer/delay
+#
+exim -bd -DSERVER=server -oX PORT_D
****
-client HOSTIPV4 PORT_D
+client 127.0.0.1 PORT_D
??? 220
-EHLO testclient
-??? 250-
-??? 250-SIZE
-??? 250-DSN
-??? 250 HELP
-MAIL FROM:<c@???>
+HELO tester
??? 250
-RCPT TO:<rmt_defer@???> NOTIFY=delay
+MAIL FROM:<a@???>
+??? 250
+RCPT TO:<fred@???>
??? 250
DATA
??? 354
-Subject: test
.
??? 250
-QUIT
-??? 221
-****
-exim -q
-****
-#
-# Clients requests no DSNs, and this one gets deferred
-exim -z defer/never
-****
-client HOSTIPV4 PORT_D
-??? 220
-EHLO testclient
-??? 250-
-??? 250-SIZE
-??? 250-DSN
-??? 250 HELP
-MAIL FROM:<d@???>
+RSET
??? 250
-RCPT TO:<rmt_defer@???> NOTIFY=never
+MAIL FROM:<b@???>
+??? 250
+RCPT TO:<jim@???>
??? 250
DATA
??? 354
-Subject: test
.
??? 250
QUIT
-??? 221
-****
-exim -q
-****
-#
-#
-#
-# Second time, for the queued deferrals.
-# We should see the notify for c@??? but not d@???
-exim -z playout
-****
-exim -Tqt 10s/ -q
****
-sleep 1
-exim -Mrm $msg1 $msg2
-****
-#
-#
+killdaemon
#
#
-# Client requests bounce+delay notification; bounce happens
-exim -z rej/failure+delay
-****
-client HOSTIPV4 PORT_D
-??? 220
-EHLO testclient
-??? 250-
-??? 250-SIZE
-??? 250-DSN
-??? 250 HELP
-MAIL FROM:<e@???>
-??? 250
-RCPT TO:<rmt_reject@???> NOTIFY=fAiLuRe,DELAY
-??? 250
+exim -bs
+HELO tester
+MAIL FROM:<a@???>
+RCPT TO:<fred@???>
DATA
-??? 354
-Subject: test
.
-??? 250
QUIT
-??? 221
-****
-# MSA send msg to MDA
-exim -q
****
-# deliver notification from MDA
-exim -z 'deliver DSN'
-****
-exim -q
-****
-sleep 1
-killdaemon
#
#
no_msglog_check
diff --git a/test/scripts/0000-Basic/0619 b/test/scripts/0000-Basic/0619
index 196b9dc..3715b12 100644
--- a/test/scripts/0000-Basic/0619
+++ b/test/scripts/0000-Basic/0619
@@ -1,45 +1,69 @@
-# log_selector msg_id and msg_id_created
+# domainlist match values
#
-# msg_id is on by default; check baseline
-exim -DLOG_SELECTOR=+received_recipients -t
-From: CALLER@???
-To: a@???
-Message-ID: original1235@???
-
-body
+exim -bs -DOPT=:
+HELO test
+MAIL FROM:<testclient>
+RCPT TO:<a@???>
+QUIT
****
#
-# msg_id is on by default; check it can be disabled
-exim -DLOG_SELECTOR=+received_recipients-msg_id -t
-From: CALLER@???
-To: b@???
-Message-ID: original1235@???
-
-body
+exim -bs '-DOPT=notthis : plainstring.ex : nothiseither'
+HELO test
+MAIL FROM:<testclient>
+RCPT TO:<a@???>
+QUIT
****
#
-# check msg_id_created shows invented ones
-exim -DLOG_SELECTOR=+received_recipients+msg_id_created -t
-From: CALLER@???
-To: c@???
-
-body
+exim -bs '-DOPT=notthis : *tail.ex : nothiseither'
+HELO test
+MAIL FROM:<testclient>
+RCPT TO:<a@???>
+QUIT
****
#
-# check msg_id_created ignores non-invented ones
-exim -DLOG_SELECTOR=+received_recipients+msg_id_created -t
-From: CALLER@???
-To: d@???
-Message-ID: original1235@???
-
-body
+exim -bs '-DOPT=notthis : ^.*r(e.)ex : nothiseither'
+HELO test
+MAIL FROM:<testclient>
+RCPT TO:<a@???>
+QUIT
****
#
-# check that bounces don't log created, by default
-exim -DLOG_SELECTOR=+received_recipients -M $msg1
+exim -bs '-DOPT=notthis : @ : nothiseither'
+HELO test
+MAIL FROM:<testclient>
+RCPT TO:<a@???>
+QUIT
****
-# and check they do with msg_id_created
-exim -DLOG_SELECTOR=+received_recipients+msg_id_created -M $msg1
+#
+#
+exim -bs '-DOPT=notthis : @[] : nothiseither'
+HELO test
+MAIL FROM:<testclient>
+RCPT TO:<a@???>
+QUIT
+****
+#
+# malformed
+exim -bs '-DOPT=notthis : @[] : nothiseither'
+HELO test
+MAIL FROM:<testclient>
+RCPT TO:<a@127.0.0.1]>
+QUIT
+****
+#
+# malformed
+exim -bs '-DOPT=notthis : @[] : nothiseither'
+HELO test
+MAIL FROM:<testclient>
+RCPT TO:<a@[127.0.0.1>
+QUIT
+****
+#
+#
+exim -bs '-DOPT=notthis : @mx_any/ignore=1.1.1.1 : nothiseither'
+HELO test
+MAIL FROM:<testclient>
+RCPT TO:<a@???>
+QUIT
****
#
-no_msglog_check
diff --git a/test/scripts/0000-Basic/0620 b/test/scripts/0000-Basic/0620
index 96d5988..0958775 100644
--- a/test/scripts/0000-Basic/0620
+++ b/test/scripts/0000-Basic/0620
@@ -1,6 +1,18 @@
-# router variables
-exim -odi a
-Subject: foo
-
-body
+# singlekey lookup ret-key
+#
+# baseline, get the data
+exim -d-all+expand -bs '-DOPT=notthis : lsearch;DIR/aux-fixed/TESTNUM.lsearch : nothiseither'
+HELO test
+MAIL FROM:<testclient>
+RCPT TO:<a@???>
+QUIT
****
+#
+# get the key
+exim -d-all+expand -bs '-DOPT=notthis : lsearch,ret=key;DIR/aux-fixed/TESTNUM.lsearch : nothiseither'
+HELO test
+MAIL FROM:<testclient>
+RCPT TO:<a@???>
+QUIT
+****
+#
diff --git a/test/scripts/0000-Basic/0622 b/test/scripts/0000-Basic/0622
deleted file mode 100644
index f3016f2..0000000
--- a/test/scripts/0000-Basic/0622
+++ /dev/null
@@ -1,49 +0,0 @@
-# bounce_message_file and warn_message_file
-#
-exim -odf a@???
-Subject: test 1.1 - Default deny message
-****
-exim -odf -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl b@???
-Subject: test 1.2 - Specified deny message file
-****
-exim -odf -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl c@???
-Subject: test 1.3 - Specified, missing deny message file
-****
-exim -odf -DOPT=relative_file_path d@???
-Subject: test 1.4 - Specified, non-absolute
-****
-exim -odf -DOPT='$acl_m_unset' e@???
-Subject: test 1.5 - Specified, expansion empty
-****
-exim -odf -DOPT='DIR/aux-fixed/TESTNUM.$sender_address' f@???
-Subject: test 1.6 - Specified, expansion tainted
-****
-exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' g@???
-Subject: test 1.7 - Specified, expansion good
-****
-#
-exim -odf delay_p@???
-Subject: test 2.1 - Default delay message
-****
-exim -odf -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl delay_q@???
-Subject: test 2.2 - Specified delay message file
-****
-exim -odf -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl delay_r@???
-Subject: test 2.3 - Specified, missing delay message file
-****
-exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' delay_s@???
-Subject: test 2.7 - Specified, expansion good
-****
-sleep 1
-exim -M $msg1
-****
-exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg2
-****
-exim -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl -M $msg3
-****
-exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg4
-****
-sleep 1
-#
-#
-no_msglog_check
diff --git a/test/scripts/0000-Basic/0623 b/test/scripts/0000-Basic/0623
deleted file mode 100644
index d43d13c..0000000
--- a/test/scripts/0000-Basic/0623
+++ /dev/null
@@ -1,57 +0,0 @@
-# free of local_part_data, domain_data, sender_data
-#
-exim -bh 99.99.99.99
-HELO tester
-MAIL FROM:<a@???>
-RCPT TO:<fred@???>
-DATA
-.
-RSET
-MAIL FROM:<b@???>
-RCPT TO:<jim@???>
-DATA
-.
-QUIT
-****
-#
-#
-exim -bd -DSERVER=server -oX PORT_D
-****
-client 127.0.0.1 PORT_D
-??? 220
-HELO tester
-??? 250
-MAIL FROM:<a@???>
-??? 250
-RCPT TO:<fred@???>
-??? 250
-DATA
-??? 354
-.
-??? 250
-RSET
-??? 250
-MAIL FROM:<b@???>
-??? 250
-RCPT TO:<jim@???>
-??? 250
-DATA
-??? 354
-.
-??? 250
-QUIT
-****
-killdaemon
-#
-#
-exim -bs
-HELO tester
-MAIL FROM:<a@???>
-RCPT TO:<fred@???>
-DATA
-.
-QUIT
-****
-#
-#
-no_msglog_check
diff --git a/test/scripts/0000-Basic/0624 b/test/scripts/0000-Basic/0624
deleted file mode 100644
index 3715b12..0000000
--- a/test/scripts/0000-Basic/0624
+++ /dev/null
@@ -1,69 +0,0 @@
-# domainlist match values
-#
-exim -bs -DOPT=:
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@???>
-QUIT
-****
-#
-exim -bs '-DOPT=notthis : plainstring.ex : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@???>
-QUIT
-****
-#
-exim -bs '-DOPT=notthis : *tail.ex : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@???>
-QUIT
-****
-#
-exim -bs '-DOPT=notthis : ^.*r(e.)ex : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@???>
-QUIT
-****
-#
-exim -bs '-DOPT=notthis : @ : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@???>
-QUIT
-****
-#
-#
-exim -bs '-DOPT=notthis : @[] : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@???>
-QUIT
-****
-#
-# malformed
-exim -bs '-DOPT=notthis : @[] : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@127.0.0.1]>
-QUIT
-****
-#
-# malformed
-exim -bs '-DOPT=notthis : @[] : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@[127.0.0.1>
-QUIT
-****
-#
-#
-exim -bs '-DOPT=notthis : @mx_any/ignore=1.1.1.1 : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@???>
-QUIT
-****
-#
diff --git a/test/scripts/0000-Basic/0625 b/test/scripts/0000-Basic/0625
deleted file mode 100644
index 0958775..0000000
--- a/test/scripts/0000-Basic/0625
+++ /dev/null
@@ -1,18 +0,0 @@
-# singlekey lookup ret-key
-#
-# baseline, get the data
-exim -d-all+expand -bs '-DOPT=notthis : lsearch;DIR/aux-fixed/TESTNUM.lsearch : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@???>
-QUIT
-****
-#
-# get the key
-exim -d-all+expand -bs '-DOPT=notthis : lsearch,ret=key;DIR/aux-fixed/TESTNUM.lsearch : nothiseither'
-HELO test
-MAIL FROM:<testclient>
-RCPT TO:<a@???>
-QUIT
-****
-#
diff --git a/test/stderr/0583 b/test/stderr/0583
deleted file mode 100644
index 3c3c7f1..0000000
--- a/test/stderr/0583
+++ /dev/null
@@ -1,12 +0,0 @@
-### Reject: no match
-### Reject, with specific SMTP message
-### Accept, matches in header CC:
-### Reject: To: & CC: combo, an env rcpt missing
-### Accept: Resent-To: & Resent-CC: combo
-
-******** SERVER ********
-### Reject: no match
-### Reject, with specific SMTP message
-### Accept, matches in header CC:
-### Reject: To: & CC: combo, an env rcpt missing
-### Accept: Resent-To: & Resent-CC: combo
diff --git a/test/stderr/0584 b/test/stderr/0584
index af4f471..d3e854e 100644
--- a/test/stderr/0584
+++ b/test/stderr/0584
@@ -1 +1,67 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@??? R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/CALLER' (file or directory name for local_delivery transport) not permitted
+>>> host in hosts_connection_nolog? no (option unset)
+>>> host in host_lookup? no (option unset)
+>>> host in host_reject_connection? no (option unset)
+>>> host in sender_unqualified_hosts? no (option unset)
+>>> host in recipient_unqualified_hosts? no (option unset)
+>>> host in helo_verify_hosts? no (option unset)
+>>> host in helo_try_verify_hosts? no (option unset)
+>>> host in helo_accept_junk_hosts? no (option unset)
+>>> using ACL "check_recipient"
+>>> processing "require" (TESTSUITE/test-config 20)
+>>> check verify = sender=userx@???
+>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+>>> routing userx@???
+>>> userx in "userx"? yes (matched "userx")
+>>> calling goodroute router
+>>> routed by goodroute router
+>>> ----------- end verify ------------
+>>> require: condition test succeeded in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 21)
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
+>>> host in ignore_fromline_hosts? no (option unset)
+LOG: 10HmaX-0005vi-00 <= userx@??? H=[127.0.0.1] P=smtp S=sss
+>>> host in hosts_connection_nolog? no (option unset)
+>>> host in host_lookup? no (option unset)
+>>> host in host_reject_connection? no (option unset)
+>>> host in sender_unqualified_hosts? no (option unset)
+>>> host in recipient_unqualified_hosts? no (option unset)
+>>> host in helo_verify_hosts? no (option unset)
+>>> host in helo_try_verify_hosts? no (option unset)
+>>> host in helo_accept_junk_hosts? no (option unset)
+>>> using ACL "check_recipient"
+>>> processing "require" (TESTSUITE/test-config 20)
+>>> check verify = sender=fail@???
+>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+>>> routing fail@???
+>>> fail in "userx"? no (end of list)
+>>> no more routers
+>>> ----------- end verify ------------
+>>> require: condition test failed in ACL "check_recipient"
+>>> end of ACL "check_recipient": not OK
+LOG: H=[127.0.0.1] sender verify fail for <fail@???>: Unrouteable address
+LOG: H=[127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: Sender verify failed
+>>> host in hosts_connection_nolog? no (option unset)
+>>> host in host_lookup? no (option unset)
+>>> host in host_reject_connection? no (option unset)
+>>> host in sender_unqualified_hosts? no (option unset)
+>>> host in recipient_unqualified_hosts? no (option unset)
+>>> host in helo_verify_hosts? no (option unset)
+>>> host in helo_try_verify_hosts? no (option unset)
+>>> host in helo_accept_junk_hosts? no (option unset)
+>>> using ACL "check_recipient"
+>>> processing "require" (TESTSUITE/test-config 20)
+>>> check verify = sender=$sender_address/defer_ok
+>>> = sender=userx@???/defer_ok
+>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+>>> routing userx@???
+>>> userx in "userx"? yes (matched "userx")
+>>> calling goodroute router
+>>> routed by goodroute router
+>>> ----------- end verify ------------
+>>> require: condition test succeeded in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 21)
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
+>>> host in ignore_fromline_hosts? no (option unset)
+LOG: 10HmaY-0005vi-00 <= userx@??? H=[127.0.0.1] P=smtp S=sss
diff --git a/test/stderr/0585 b/test/stderr/0585
index dc309d8..3c3c7f1 100644
--- a/test/stderr/0585
+++ b/test/stderr/0585
@@ -1 +1,12 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 == |TESTSUITE/bin/iefbr14 <pipe-userx=TESTSUITE/bin/iefbr14@???> R=r2 T=t2 defer (0): Tainted 'TESTSUITE/bin/iefbr14' (command for t2 transport) not permitted
+### Reject: no match
+### Reject, with specific SMTP message
+### Accept, matches in header CC:
+### Reject: To: & CC: combo, an env rcpt missing
+### Accept: Resent-To: & Resent-CC: combo
+
+******** SERVER ********
+### Reject: no match
+### Reject, with specific SMTP message
+### Accept, matches in header CC:
+### Reject: To: & CC: combo, an env rcpt missing
+### Accept: Resent-To: & Resent-CC: combo
diff --git a/test/stderr/0605 b/test/stderr/0587
similarity index 100%
rename from test/stderr/0605
rename to test/stderr/0587
diff --git a/test/stderr/0606 b/test/stderr/0588
similarity index 100%
rename from test/stderr/0606
rename to test/stderr/0588
diff --git a/test/stderr/0591 b/test/stderr/0591
deleted file mode 100644
index d3e854e..0000000
--- a/test/stderr/0591
+++ /dev/null
@@ -1,67 +0,0 @@
->>> host in hosts_connection_nolog? no (option unset)
->>> host in host_lookup? no (option unset)
->>> host in host_reject_connection? no (option unset)
->>> host in sender_unqualified_hosts? no (option unset)
->>> host in recipient_unqualified_hosts? no (option unset)
->>> host in helo_verify_hosts? no (option unset)
->>> host in helo_try_verify_hosts? no (option unset)
->>> host in helo_accept_junk_hosts? no (option unset)
->>> using ACL "check_recipient"
->>> processing "require" (TESTSUITE/test-config 20)
->>> check verify = sender=userx@???
->>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
->>> routing userx@???
->>> userx in "userx"? yes (matched "userx")
->>> calling goodroute router
->>> routed by goodroute router
->>> ----------- end verify ------------
->>> require: condition test succeeded in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 21)
->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
->>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaX-0005vi-00 <= userx@??? H=[127.0.0.1] P=smtp S=sss
->>> host in hosts_connection_nolog? no (option unset)
->>> host in host_lookup? no (option unset)
->>> host in host_reject_connection? no (option unset)
->>> host in sender_unqualified_hosts? no (option unset)
->>> host in recipient_unqualified_hosts? no (option unset)
->>> host in helo_verify_hosts? no (option unset)
->>> host in helo_try_verify_hosts? no (option unset)
->>> host in helo_accept_junk_hosts? no (option unset)
->>> using ACL "check_recipient"
->>> processing "require" (TESTSUITE/test-config 20)
->>> check verify = sender=fail@???
->>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
->>> routing fail@???
->>> fail in "userx"? no (end of list)
->>> no more routers
->>> ----------- end verify ------------
->>> require: condition test failed in ACL "check_recipient"
->>> end of ACL "check_recipient": not OK
-LOG: H=[127.0.0.1] sender verify fail for <fail@???>: Unrouteable address
-LOG: H=[127.0.0.1] F=<userx@???> rejected RCPT <userx@???>: Sender verify failed
->>> host in hosts_connection_nolog? no (option unset)
->>> host in host_lookup? no (option unset)
->>> host in host_reject_connection? no (option unset)
->>> host in sender_unqualified_hosts? no (option unset)
->>> host in recipient_unqualified_hosts? no (option unset)
->>> host in helo_verify_hosts? no (option unset)
->>> host in helo_try_verify_hosts? no (option unset)
->>> host in helo_accept_junk_hosts? no (option unset)
->>> using ACL "check_recipient"
->>> processing "require" (TESTSUITE/test-config 20)
->>> check verify = sender=$sender_address/defer_ok
->>> = sender=userx@???/defer_ok
->>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
->>> routing userx@???
->>> userx in "userx"? yes (matched "userx")
->>> calling goodroute router
->>> routed by goodroute router
->>> ----------- end verify ------------
->>> require: condition test succeeded in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 21)
->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
->>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaY-0005vi-00 <= userx@??? H=[127.0.0.1] P=smtp S=sss
diff --git a/test/paniclog/0584 b/test/stderr/0593
similarity index 100%
rename from test/paniclog/0584
rename to test/stderr/0593
diff --git a/test/paniclog/0585 b/test/stderr/0594
similarity index 100%
rename from test/paniclog/0585
rename to test/stderr/0594
diff --git a/test/stderr/0615 b/test/stderr/0601
similarity index 100%
copy from test/stderr/0615
copy to test/stderr/0601
diff --git a/test/stderr/0604 b/test/stderr/0604
deleted file mode 100644
index 045fadc..0000000
--- a/test/stderr/0604
+++ /dev/null
@@ -1,2 +0,0 @@
-
-******** SERVER ********
diff --git a/test/stderr/0622 b/test/stderr/0608
similarity index 70%
rename from test/stderr/0622
rename to test/stderr/0608
index 544d65c..0cf96cf 100644
--- a/test/stderr/0622
+++ b/test/stderr/0608
@@ -1,8 +1,8 @@
-2017-07-30 18:51:05.712 10HmaX-0005vi-00 Failed to open TESTSUITE/aux-fixed/0622.nonexist.tmpl for error message texts: No such file or directory
+2017-07-30 18:51:05.712 10HmaX-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for error message texts: No such file or directory
2017-07-30 18:51:05.712 10HmaY-0005vi-00 bounce_message_file is not absolute after expansion: 'relative_file_path'
2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Failed to expand bounce_message_file: '$acl_m_unset'
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0622.CALLER@???'
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@???'
-2017-07-30 18:51:05.712 10HmbB-0005vi-00 Failed to open TESTSUITE/aux-fixed/0622.nonexist.tmpl for warning message texts: No such file or directory
+2017-07-30 18:51:05.712 10HmbB-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for warning message texts: No such file or directory
diff --git a/test/stderr/0615 b/test/stderr/0615
index 2a00021..045fadc 100644
--- a/test/stderr/0615
+++ b/test/stderr/0615
@@ -1,64 +1,2 @@
-SYSLOG: '10HmaX-0005vi-00 msg'
-SYSLOG: '10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '10HmaY-0005vi-00 msg'
-SYSLOG: '10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '10HmaZ-0005vi-00 msg'
-SYSLOG: '10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '10HmbA-0005vi-00 msg'
-SYSLOG: '10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '10HmbB-0005vi-00 msg'
-SYSLOG: '10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '10HmbC-0005vi-00 msg'
-SYSLOG: '10HmbC-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '10HmbD-0005vi-00 msg'
-SYSLOG: '10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '10HmbE-0005vi-00 msg'
-SYSLOG: '10HmbE-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '10HmbF-0005vi-00 msg'
-SYSLOG: '10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '10HmbG-0005vi-00 msg'
-SYSLOG: '10HmbG-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '10HmbH-0005vi-00 msg'
-SYSLOG: '10HmbH-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '10HmbI-0005vi-00 msg'
-SYSLOG: '10HmbI-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '[1250] 10HmbJ-0005vi-00 msg'
-SYSLOG: '[1250] 10HmbJ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '[1251] 10HmbK-0005vi-00 msg'
-SYSLOG: '[1251] 10HmbK-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '[1252] 10HmbL-0005vi-00 msg'
-SYSLOG: '[1252] 10HmbL-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '[1253] 10HmbM-0005vi-00 msg'
-SYSLOG: '[1253] 10HmbM-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05 10HmbN-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05 10HmbN-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05 +9999 10HmbO-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05 +9999 10HmbO-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05.712 10HmbP-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05.712 10HmbP-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbQ-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbQ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05 10HmbR-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05 10HmbR-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05 +9999 10HmbS-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05 +9999 10HmbS-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05.712 10HmbT-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05.712 10HmbT-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbU-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbU-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05 10HmbV-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05 10HmbV-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05 +9999 10HmbW-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05 +9999 10HmbW-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05.712 10HmbX-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05.712 10HmbX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbY-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05.712 +9999 10HmbY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05 [1254] 10HmbZ-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05 [1254] 10HmbZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05 +9999 10HmcA-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05 +9999 10HmcA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05.712 [1255] 10HmcB-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05.712 [1255] 10HmcB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
-SYSLOG: '2017-07-30 18:51:05.712 +9999 [1256] 10HmcC-0005vi-00 msg'
-SYSLOG: '2017-07-30 18:51:05.712 +9999 [1256] 10HmcC-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss'
+
+******** SERVER ********
diff --git a/test/stderr/0623 b/test/stderr/0618
similarity index 59%
rename from test/stderr/0623
rename to test/stderr/0618
index 21ac5f2..6ae33ae 100644
--- a/test/stderr/0623
+++ b/test/stderr/0618
@@ -9,19 +9,19 @@
>>> tester in helo_lookup_domains? no (end of list)
>>> using ACL "chk_rcpt"
>>> processing "accept" (TESTSUITE/test-config 20)
->>> check local_parts = lsearch;TESTSUITE/aux-fixed/0623.list
->>> fred in "lsearch;TESTSUITE/aux-fixed/0623.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0623.list")
->>> check domains = lsearch;TESTSUITE/aux-fixed/0623.list
->>> good1.ex in "lsearch;TESTSUITE/aux-fixed/0623.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0623.list")
+>>> check local_parts = lsearch;TESTSUITE/aux-fixed/0618.list
+>>> fred in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
+>>> check domains = lsearch;TESTSUITE/aux-fixed/0618.list
+>>> good1.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
>>> accept: condition test succeeded in ACL "chk_rcpt"
>>> end of ACL "chk_rcpt": ACCEPT
LOG: 10HmbA-0005vi-00 <= a@??? H=(tester) [99.99.99.99] P=smtp S=sss
>>> using ACL "chk_rcpt"
>>> processing "accept" (TESTSUITE/test-config 20)
->>> check local_parts = lsearch;TESTSUITE/aux-fixed/0623.list
->>> jim in "lsearch;TESTSUITE/aux-fixed/0623.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0623.list")
->>> check domains = lsearch;TESTSUITE/aux-fixed/0623.list
->>> good2.ex in "lsearch;TESTSUITE/aux-fixed/0623.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0623.list")
+>>> check local_parts = lsearch;TESTSUITE/aux-fixed/0618.list
+>>> jim in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
+>>> check domains = lsearch;TESTSUITE/aux-fixed/0618.list
+>>> good2.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
>>> accept: condition test succeeded in ACL "chk_rcpt"
>>> end of ACL "chk_rcpt": ACCEPT
LOG: 10HmbB-0005vi-00 <= b@??? H=(tester) [99.99.99.99] P=smtp S=sss
diff --git a/test/stderr/0625 b/test/stderr/0620
similarity index 100%
rename from test/stderr/0625
rename to test/stderr/0620
diff --git a/test/stdout/0583 b/test/stdout/0583
index 9c896e3..9f70b73 100644
--- a/test/stdout/0583
+++ b/test/stdout/0583
@@ -1,52 +1,61 @@
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
-221 myhost.test.ex closing connection
-### Reject: no match
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-550 Administrative prohibition
-221 myhost.test.ex closing connection
-### Reject, with specific SMTP message
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-550 Rejected after DATA: bcc recipient detected
-221 myhost.test.ex closing connection
-### Accept, matches in header CC:
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 OK
-250 Accepted
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
-221 myhost.test.ex closing connection
-### Reject: To: & CC: combo, an env rcpt missing
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 OK
-250 Accepted
-250 Accepted
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-550 Administrative prohibition
-221 myhost.test.ex closing connection
-### Accept: Resent-To: & Resent-CC: combo
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 OK
-250 Accepted
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
-221 myhost.test.ex closing connection
-
-******** SERVER ********
-### Reject: no match
-### Reject, with specific SMTP message
-### Accept, matches in header CC:
-### Reject: To: & CC: combo, an env rcpt missing
-### Accept: Resent-To: & Resent-CC: combo
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> EHLO test
+??? 250-
+<<< 250-myhost.test.ex Hello test [127.0.0.1]
+??? 250-SIZE
+<<< 250-SIZE 52428800
+??? 250-8BITMIME
+<<< 250-8BITMIME
+??? 250-PIPELINING
+<<< 250-PIPELINING
+??? 250 HELP
+<<< 250 HELP
+>>> MAIL FROM:<a@???>\r\nRCPT TO:<quota_good@???>
+??? 250
+<<< 250 OK
+??? 250
+<<< 250 Accepted
+>>> RSET
+??? 250
+<<< 250 Reset OK
+>>> MAIL FROM:<b@???> SIZE=ssss\r\nRCPT TO:<quota_fail@???>
+??? 250
+<<< 250 OK
+??? 550
+<<< 550 Administrative prohibition
+>>> RSET
+??? 250
+<<< 250 Reset OK
+>>> MAIL FROM:<c@???>\r\nRCPT TO:<route_fail@???>
+??? 250
+<<< 250 OK
+??? 550
+<<< 550 Administrative prohibition
+>>> RSET
+??? 250
+<<< 250 Reset OK
+>>> MAIL FROM:<d@???>\r\nRCPT TO:<quota_good@???>
+??? 250
+<<< 250 OK
+??? 250
+<<< 250 Accepted
+>>> RSET
+??? 250
+<<< 250 Reset OK
+>>> MAIL FROM:<e@???> SIZE=ssss\r\nRCPT TO:<quota_fail@???>
+??? 250
+<<< 250 OK
+??? 550
+<<< 550 Administrative prohibition
+>>> RSET
+??? 250
+<<< 250 Reset OK
+>>> MAIL FROM:<f@???>\r\nRCPT TO:<route_fail@???>
+??? 250
+<<< 250 OK
+??? 550
+<<< 550 Administrative prohibition
+>>> QUIT
+End of script
diff --git a/test/stdout/0584 b/test/stdout/0584
index 4e4673d..620e8f8 100644
--- a/test/stdout/0584
+++ b/test/stdout/0584
@@ -1,6 +1,39 @@
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+
+**** SMTP testing session as if from host 127.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
250 OK id=10HmaX-0005vi-00
-221 the.local.host.name closing connection
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 127.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Verification failed for <fail@???>
+550-Unrouteable address
+550 Sender verify failed
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 127.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0583 b/test/stdout/0585
similarity index 100%
copy from test/stdout/0583
copy to test/stdout/0585
diff --git a/test/stdout/0586 b/test/stdout/0586
index 0fe0617..9681d83 100644
--- a/test/stdout/0586
+++ b/test/stdout/0586
@@ -1,2 +1,14 @@
-abcd@??? cannot be resolved at this time: Tainted name 'TESTSUITE/aux-fixed/0586.list.abcd' for file read not permitted
-
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> HELO localhost
+??? 250
+<<< 250 myhost.test.ex Hello localhost [127.0.0.1]
+End of script
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> HELO l-sec
+??? 250
+<<< 250 myhost.test.ex Hello localhost [127.0.0.1]
+End of script
diff --git a/test/stdout/0587 b/test/stdout/0587
index 1c94559..64db999 100644
--- a/test/stdout/0587
+++ b/test/stdout/0587
@@ -1,14 +1,10 @@
+
+**** SMTP testing session as if from host ip4.ip4.ip4.ip4
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [ip4.ip4.ip4.ip4]
250 OK
-250 Accepted
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
-221 the.local.host.name closing connection
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 OK
-250 Accepted
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+451 Temporary local problem - please try later
221 the.local.host.name closing connection
diff --git a/test/stdout/0588 b/test/stdout/0588
index 994f04e..5ea77a3 100644
--- a/test/stdout/0588
+++ b/test/stdout/0588
@@ -1,40 +1,20 @@
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> HELO test
-??? 250
-<<< 250 the.local.host.name Hello test [127.0.0.1]
->>> MAIL FROM:<CALLER@???>
-??? 250
-<<< 250 OK
->>> RCPT TO:<good@???>
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> Subject: should be good
->>>
->>> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
->>> .
-??? 250
-<<< 250 OK id=10HmaX-0005vi-00
->>> MAIL FROM:<CALLER@???>
-??? 250
-<<< 250 OK
->>> RCPT TO:<bad@???>
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> Subject: should be bad
->>>
->>> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
->>> .
-??? 250
-<<< 250 OK id=10HmaY-0005vi-00
->>> QUIT
-??? 221
-<<< 221 the.local.host.name closing connection
-End of script
+
+**** SMTP testing session as if from host 127.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [127.0.0.1]
+250 OK
+250 Accepted
+221 the.local.host.name closing connection
+
+**** SMTP testing session as if from host 127.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello test [127.0.0.1]
+250 OK
+250 Accepted
+221 the.local.host.name closing connection
diff --git a/test/stdout/0589 b/test/stdout/0589
index 9f70b73..994f04e 100644
--- a/test/stdout/0589
+++ b/test/stdout/0589
@@ -1,61 +1,40 @@
Connecting to 127.0.0.1 port 1225 ... connected
??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> EHLO test
-??? 250-
-<<< 250-myhost.test.ex Hello test [127.0.0.1]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250-8BITMIME
-<<< 250-8BITMIME
-??? 250-PIPELINING
-<<< 250-PIPELINING
-??? 250 HELP
-<<< 250 HELP
->>> MAIL FROM:<a@???>\r\nRCPT TO:<quota_good@???>
+<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> HELO test
??? 250
-<<< 250 OK
-??? 250
-<<< 250 Accepted
->>> RSET
-??? 250
-<<< 250 Reset OK
->>> MAIL FROM:<b@???> SIZE=ssss\r\nRCPT TO:<quota_fail@???>
-??? 250
-<<< 250 OK
-??? 550
-<<< 550 Administrative prohibition
->>> RSET
-??? 250
-<<< 250 Reset OK
->>> MAIL FROM:<c@???>\r\nRCPT TO:<route_fail@???>
-??? 250
-<<< 250 OK
-??? 550
-<<< 550 Administrative prohibition
->>> RSET
-??? 250
-<<< 250 Reset OK
->>> MAIL FROM:<d@???>\r\nRCPT TO:<quota_good@???>
+<<< 250 the.local.host.name Hello test [127.0.0.1]
+>>> MAIL FROM:<CALLER@???>
??? 250
<<< 250 OK
+>>> RCPT TO:<good@???>
??? 250
<<< 250 Accepted
->>> RSET
+>>> DATA
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Subject: should be good
+>>>
+>>> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+>>> .
??? 250
-<<< 250 Reset OK
->>> MAIL FROM:<e@???> SIZE=ssss\r\nRCPT TO:<quota_fail@???>
+<<< 250 OK id=10HmaX-0005vi-00
+>>> MAIL FROM:<CALLER@???>
??? 250
<<< 250 OK
-??? 550
-<<< 550 Administrative prohibition
->>> RSET
+>>> RCPT TO:<bad@???>
??? 250
-<<< 250 Reset OK
->>> MAIL FROM:<f@???>\r\nRCPT TO:<route_fail@???>
-??? 250
-<<< 250 OK
-??? 550
-<<< 550 Administrative prohibition
+<<< 250 Accepted
+>>> DATA
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Subject: should be bad
+>>>
+>>> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+>>> .
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
>>> QUIT
+??? 221
+<<< 221 the.local.host.name closing connection
End of script
diff --git a/test/stdout/0591 b/test/stdout/0591
deleted file mode 100644
index 620e8f8..0000000
--- a/test/stdout/0591
+++ /dev/null
@@ -1,39 +0,0 @@
-
-**** SMTP testing session as if from host 127.0.0.1
-**** but without any ident (RFC 1413) callback.
-**** This is not for real!
-
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
-
-**** SMTP testing: that is not a real message id!
-
-221 myhost.test.ex closing connection
-
-**** SMTP testing session as if from host 127.0.0.1
-**** but without any ident (RFC 1413) callback.
-**** This is not for real!
-
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 OK
-550-Verification failed for <fail@???>
-550-Unrouteable address
-550 Sender verify failed
-221 myhost.test.ex closing connection
-
-**** SMTP testing session as if from host 127.0.0.1
-**** but without any ident (RFC 1413) callback.
-**** This is not for real!
-
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
-
-**** SMTP testing: that is not a real message id!
-
-221 myhost.test.ex closing connection
diff --git a/test/stdout/0584 b/test/stdout/0593
similarity index 100%
copy from test/stdout/0584
copy to test/stdout/0593
diff --git a/test/stdout/0586 b/test/stdout/0595
similarity index 52%
copy from test/stdout/0586
copy to test/stdout/0595
index 0fe0617..dce7e84 100644
--- a/test/stdout/0586
+++ b/test/stdout/0595
@@ -1,2 +1,2 @@
-abcd@??? cannot be resolved at this time: Tainted name 'TESTSUITE/aux-fixed/0586.list.abcd' for file read not permitted
+abcd@??? cannot be resolved at this time: Tainted name 'TESTSUITE/aux-fixed/0595.list.abcd' for file read not permitted
diff --git a/test/stdout/0587 b/test/stdout/0596
similarity index 100%
copy from test/stdout/0587
copy to test/stdout/0596
diff --git a/test/stdout/0599 b/test/stdout/0597
similarity index 100%
copy from test/stdout/0599
copy to test/stdout/0597
diff --git a/test/stdout/0599 b/test/stdout/0599
index ee9dd95..3c2710e 100644
--- a/test/stdout/0599
+++ b/test/stdout/0599
@@ -1,74 +1,7 @@
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> HELO me
-??? 250
-<<< 250 the.local.host.name Hello me [127.0.0.1]
->>> MAIL FROM:<CALLER@???>
-??? 250
-<<< 250 OK
->>> RCPT TO:<queue_only_1@???>
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> Subject: 1
->>> .
-??? 250
-<<< 250 OK id=10HmaX-0005vi-00
->>> RSET
-??? 250
-<<< 250 Reset OK
->>> MAIL FROM:<CALLER@???>
-??? 250
-<<< 250 OK
->>> RCPT TO:<queue_only_2@???>
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> Subject: 2
->>> .
-??? 250
-<<< 250 OK id=10HmaZ-0005vi-00
->>> QUIT
-End of script
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> HELO me
-??? 250
-<<< 250 the.local.host.name Hello me [127.0.0.1]
->>> MAIL FROM:<CALLER@???>
-??? 250
-<<< 250 OK
->>> RCPT TO:<first_pass_route_1@???>
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> Subject: 1
->>> .
-??? 250
-<<< 250 OK id=10HmbB-0005vi-00
->>> RSET
-??? 250
-<<< 250 Reset OK
->>> MAIL FROM:<CALLER@???>
-??? 250
-<<< 250 OK
->>> RCPT TO:<first_pass_route_2@???>
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> Subject: 2
->>> .
-??? 250
-<<< 250 OK id=10HmbD-0005vi-00
->>> QUIT
-End of script
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+221 the.local.host.name closing connection
+received: message from exim
diff --git a/test/stdout/0601 b/test/stdout/0601
deleted file mode 100644
index 3c2710e..0000000
--- a/test/stdout/0601
+++ /dev/null
@@ -1,7 +0,0 @@
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
-221 the.local.host.name closing connection
-received: message from exim
diff --git a/test/stdout/0603 b/test/stdout/0603
deleted file mode 100644
index ee9b665..0000000
--- a/test/stdout/0603
+++ /dev/null
@@ -1,31 +0,0 @@
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
-250 Reset OK
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
-250 Reset OK
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
-250 Reset OK
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
-250 Reset OK
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
-250 Reset OK
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
-221 the.local.host.name closing connection
diff --git a/test/stdout/0605 b/test/stdout/0605
index 64db999..f670e1e 100644
--- a/test/stdout/0605
+++ b/test/stdout/0605
@@ -1,10 +1,10 @@
-
-**** SMTP testing session as if from host ip4.ip4.ip4.ip4
-**** but without any ident (RFC 1413) callback.
-**** This is not for real!
-
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 the.local.host.name Hello test [ip4.ip4.ip4.ip4]
-250 OK
-451 Temporary local problem - please try later
-221 the.local.host.name closing connection
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> QUIT
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> QUIT
+End of script
diff --git a/test/stdout/0606 b/test/stdout/0606
deleted file mode 100644
index 5ea77a3..0000000
--- a/test/stdout/0606
+++ /dev/null
@@ -1,20 +0,0 @@
-
-**** SMTP testing session as if from host 127.0.0.1
-**** but without any ident (RFC 1413) callback.
-**** This is not for real!
-
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 the.local.host.name Hello test [127.0.0.1]
-250 OK
-250 Accepted
-221 the.local.host.name closing connection
-
-**** SMTP testing session as if from host 127.0.0.1
-**** but without any ident (RFC 1413) callback.
-**** This is not for real!
-
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 the.local.host.name Hello test [127.0.0.1]
-250 OK
-250 Accepted
-221 the.local.host.name closing connection
diff --git a/test/stdout/0608 b/test/stdout/0608
deleted file mode 100644
index 9681d83..0000000
--- a/test/stdout/0608
+++ /dev/null
@@ -1,14 +0,0 @@
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> HELO localhost
-??? 250
-<<< 250 myhost.test.ex Hello localhost [127.0.0.1]
-End of script
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> HELO l-sec
-??? 250
-<<< 250 myhost.test.ex Hello localhost [127.0.0.1]
-End of script
diff --git a/test/stdout/0618 b/test/stdout/0612
similarity index 100%
copy from test/stdout/0618
copy to test/stdout/0612
diff --git a/test/stdout/0614 b/test/stdout/0614
index f670e1e..ee9b665 100644
--- a/test/stdout/0614
+++ b/test/stdout/0614
@@ -1,10 +1,31 @@
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> QUIT
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> QUIT
-End of script
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbA-0005vi-00
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbB-0005vi-00
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+221 the.local.host.name closing connection
diff --git a/test/stdout/0604 b/test/stdout/0615
similarity index 100%
rename from test/stdout/0604
rename to test/stdout/0615
diff --git a/test/stdout/0618 b/test/stdout/0618
index 6bb2ca9..27103d9 100644
--- a/test/stdout/0618
+++ b/test/stdout/0618
@@ -1,161 +1,65 @@
+
+**** SMTP testing session as if from host 99.99.99.99
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello tester [99.99.99.99]
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbA-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbB-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 the.local.host.name closing connection
Connecting to 127.0.0.1 port 1225 ... connected
??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> EHLO testclient
-??? 250-
-<<< 250-myhost.test.ex Hello testclient [127.0.0.1]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250 HELP
-<<< 250 HELP
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> EHLO testclient
-??? 250-
-<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250-DSN
-<<< 250-DSN
-??? 250 HELP
-<<< 250 HELP
->>> MAIL FROM:<a@???>
-??? 250
-<<< 250 OK
->>> RCPT TO:<any@???> NOTIFY=foo
-??? 501
-<<< 501 Invalid value for NOTIFY parameter
->>> RCPT TO:<rmt_reject@???> NOTIFY=never
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> Subject: test
->>> .
+<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> HELO tester
??? 250
-<<< 250 OK id=10HmaX-0005vi-00
->>> QUIT
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> EHLO testclient
-??? 250-
-<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250-DSN
-<<< 250-DSN
-??? 250 HELP
-<<< 250 HELP
->>> MAIL FROM:<b@???>
+<<< 250 the.local.host.name Hello tester [127.0.0.1]
+>>> MAIL FROM:<a@???>
??? 250
<<< 250 OK
->>> RCPT TO:<rmt_accept@???> NOTIFY=success
+>>> RCPT TO:<fred@???>
??? 250
<<< 250 Accepted
>>> DATA
??? 354
<<< 354 Enter message, ending with "." on a line by itself
->>> Subject: test
>>> .
??? 250
<<< 250 OK id=10HmaY-0005vi-00
->>> QUIT
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> EHLO testclient
-??? 250-
-<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250-DSN
-<<< 250-DSN
-??? 250 HELP
-<<< 250 HELP
->>> MAIL FROM:<c@???>
-??? 250
-<<< 250 OK
->>> RCPT TO:<rmt_defer@???> NOTIFY=delay
+>>> RSET
??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> Subject: test
->>> .
-??? 250
-<<< 250 OK id=10HmbB-0005vi-00
->>> QUIT
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> EHLO testclient
-??? 250-
-<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250-DSN
-<<< 250-DSN
-??? 250 HELP
-<<< 250 HELP
->>> MAIL FROM:<d@???>
-??? 250
-<<< 250 OK
->>> RCPT TO:<rmt_defer@???> NOTIFY=never
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> Subject: test
->>> .
-??? 250
-<<< 250 OK id=10HmbC-0005vi-00
->>> QUIT
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
-Message 10HmbB-0005vi-00 has been removed
-Message 10HmbC-0005vi-00 has been removed
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> EHLO testclient
-??? 250-
-<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250-DSN
-<<< 250-DSN
-??? 250 HELP
-<<< 250 HELP
->>> MAIL FROM:<e@???>
+<<< 250 Reset OK
+>>> MAIL FROM:<b@???>
??? 250
<<< 250 OK
->>> RCPT TO:<rmt_reject@???> NOTIFY=fAiLuRe,DELAY
+>>> RCPT TO:<jim@???>
??? 250
<<< 250 Accepted
>>> DATA
??? 354
<<< 354 Enter message, ending with "." on a line by itself
->>> Subject: test
>>> .
??? 250
-<<< 250 OK id=10HmbE-0005vi-00
+<<< 250 OK id=10HmaZ-0005vi-00
>>> QUIT
-??? 221
-<<< 221 myhost.test.ex closing connection
End of script
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 the.local.host.name Hello CALLER at tester
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+221 the.local.host.name closing connection
diff --git a/test/stdout/0624 b/test/stdout/0619
similarity index 100%
rename from test/stdout/0624
rename to test/stdout/0619
diff --git a/test/stdout/0625 b/test/stdout/0620
similarity index 100%
rename from test/stdout/0625
rename to test/stdout/0620
diff --git a/test/stdout/0623 b/test/stdout/0623
deleted file mode 100644
index 27103d9..0000000
--- a/test/stdout/0623
+++ /dev/null
@@ -1,65 +0,0 @@
-
-**** SMTP testing session as if from host 99.99.99.99
-**** but without any ident (RFC 1413) callback.
-**** This is not for real!
-
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 the.local.host.name Hello tester [99.99.99.99]
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
-
-**** SMTP testing: that is not a real message id!
-
-250 Reset OK
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
-
-**** SMTP testing: that is not a real message id!
-
-221 the.local.host.name closing connection
-Connecting to 127.0.0.1 port 1225 ... connected
-??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> HELO tester
-??? 250
-<<< 250 the.local.host.name Hello tester [127.0.0.1]
->>> MAIL FROM:<a@???>
-??? 250
-<<< 250 OK
->>> RCPT TO:<fred@???>
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> .
-??? 250
-<<< 250 OK id=10HmaY-0005vi-00
->>> RSET
-??? 250
-<<< 250 Reset OK
->>> MAIL FROM:<b@???>
-??? 250
-<<< 250 OK
->>> RCPT TO:<jim@???>
-??? 250
-<<< 250 Accepted
->>> DATA
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> .
-??? 250
-<<< 250 OK id=10HmaZ-0005vi-00
->>> QUIT
-End of script
-220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 the.local.host.name Hello CALLER at tester
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
-221 the.local.host.name closing connection
