452 files changed, 19041 insertions, 0 deletions
diff --git a/test/stdout/0001 b/test/stdout/0001
new file mode 100644
index 000000000..6d605f251
--- /dev/null
+++ b/test/stdout/0001
@@ -0,0 +1,21 @@
+accept_8bitmime
+bounce_message_file = 
+callout_domain_negative_expire = 1h
+daemon_smtp_ports = 
+envelope_to_remove
+finduser_retries = 0
+gecos_name = CALLER_NAME
+headers_charset = UTF-8
+ignore_bounce_errors_after = 2m
+keep_malformed = 4d
+no_local_from_check
+max_username_length = 8
+never_users = root:root
+percent_hack_domains = 
+qualify_domain = some.dom.ain
+receive_timeout = 0s
+sender_unqualified_hosts = localhost:some.host.name
+no_tcp_nodelay
+trusted_users = 1234:5678
+unknown_login = unknownlogin
+warn_message_file = /home/exim/test/warnmsg_file
diff --git a/test/stdout/0002 b/test/stdout/0002
new file mode 100644
index 000000000..b2e86b2a6
--- /dev/null
+++ b/test/stdout/0002
@@ -0,0 +1,656 @@
+> 
+> # These expansions can test variables in the configuration, but as there
+> # is no message being processed, there is no message-related data. But
+> # that of course gets tested in plenty of other places.
+> 
+> # Some fixed variables
+> 
+> exim_path: TESTSUITE/eximdir/exim
+> primary_hostname: myhost.test.ex
+> primary_hostname: myhost.test.ex
+> qualify_domain: myhost.test.ex
+> bounce_return_size_limit: 102400
+> spool_directory: TESTSUITE/spool
+> Failed: unknown variable in "${unknown}"
+> h_subject: (should be empty)
+> h_subject: (should be empty)
+> Failed: unknown expansion operator "header_subject"
+> 
+> # $message_headers should be empty
+> message_headers: ><
+> 
+> # Continuation
+> xy
+> xy
+> 
+> # Overlong names and overbig numbers
+> 
+> Failed: unknown variable name "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+> Failed: unknown variable in "${aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}"
+> +
+> +
+> 
+> # Operators
+> 
+> addrss: local-part@dom.ain
+> addrss: local-part@dom.ain
+> domain: dom.ain
+> domain: dom.ain
+> escape: B7\267F2\362
+> eval:   2
+> eval:   7
+> eval:   9
+> eval:   4
+> eval:   6
+> eval:   42
+> Failed: error in expression evaluation: expecting number or opening parenthesis (after processing "")
+> eval:   -2
+> eval:   1
+> eval:   1
+> Failed: error in expression evaluation: expecting closing parenthesis (after processing "-2 - (-3")
+> Failed: error in expression evaluation: expecting + or - (after processing "-2 - -3")
+> eval:   1
+> eval:   -5
+> Failed: error in expression evaluation: expecting number or opening parenthesis (after processing "-2 -")
+> eval:   40962
+> eval:   63
+> Failed: error in expression evaluation: expecting + or - (after processing "0")
+> eval10: 77
+> eval10: 8
+> expand: $primary_hostname myhost.test.ex
+> hash:   jmg monty fbWx
+> hash:   abcX abX aX X
+> hex2b64:EjRWeA==
+> hex2b64:q83v
+> hex2b64:q83v
+> hex2b64:Gis8TV5v
+> Failed: "1a2b3c4d5e6" contains an odd number of characters
+> Failed: "1a2b3c4d5e6g" is not a hex string
+> hex2b64:MPPJPkZDbetYunCBao7BJA==
+> hex2b64:ztcfpyNSMb7Tg/rP3EHE3cwi7PE=
+> 
+> The base62 operator is actually a base36 operator in the Darwin and Cygwin
+> environments. Write cunning tests that produce the same output in both cases,
+> while doing a reasonable check.
+> 
+> base62:  OK
+> base62d: OK
+> base62d: OK
+> Failed: argument for base62 operator is "12345x", which is not a decimal number
+> Failed: argument for base62d operator is "0003D7.", which is not a base 36/62 number
+> 
+> hmac:   dd97e3ba5d1a61b5006108f8c8252953
+> hmac:   0210cf9d274b53f1550f657c378b29e8bfed1064
+> md5:    77add1d5f41223d5582fca736a5cb335
+> sha1:   DA39A3EE5E6B4B0D3255BFEF95601890AFD80709
+> sha1:   A9993E364706816ABA3E25717850C26C9CD0D89D
+> mask:   192.168.10.192/28
+> mask:   192.168.10.206/32
+> Failed: mask value too big in "192.168.10.206/33"
+> mask:   0.0.0.0/0
+> Failed: missing mask value in "192.168.10.206"
+> Failed: "a.b.c.d" is not an IP address
+> nhash:  19 0/61
+> lc/uc:  the quick  BROWN FOX
+> length: The quick  abc
+> lclpt:  local-part
+> lclpt:  local-part
+> quote:  aZ09_.-Q "ab*cd" "abcd\"ef"
+> quote:  "nl(\n)"
+> quote:  "cr(\r)"
+> quote:  "tab(	)"
+> quote:  "xff(�)"
+> quote:  Empty>""<
+> quote_local_part: abcd
+> quote_local_part: O'Reilly
+> quote_local_part: "a space"
+> quote_local_part: ".something"
+> quote_local_part: "something."
+> quote_local_part: joe.bloggs
+> quote_local_part: a!b
+> quote_local_part: "x@y"
+> quote_local_part: ab*cd
+> quote_local_part: "x:y"
+> quote_local_part: "abcd\"ef"
+> quote_local_part: ""
+> rxquote:aZ09\_\,\-Q ab\*cd abcd\"ef
+> substr: ba 34  1
+> substr: barb rhuba
+> substr: 
+> substr: 
+> str2b64:YWJjZA==
+> str2b64:VGhlIHF1aWNrIGJyb3duIAogZm94
+> strlen: 0
+> strlen: 1
+> strlen: 8
+> time_interval: 0s
+> time_interval: 44s
+> time_interval: 1w4d13h46m39s
+> Failed: string "-1" is not a positive number in "time_interval" operator
+> Failed: string "rhubarb" is not a positive number in "time_interval" operator
+> 
+> # stat is a bit tricky, but some of the fields of the aux-var directory
+> # should be the same on all systems
+> 
+> stat:   40755
+> stat:   drwxr-xr-x
+> Failed: stat(/a/non/existent/file) failed: No such file or directory
+> 
+> # "Operators" that have expanded arguments
+> 
+> hash:   jmg monty fbWx
+> hash:   abcX abX aX X
+> nhash:  19 0/61
+> length: The quick  abc
+> substr: ba 34  1
+> substr: 
+> 
+> # Error forms
+> 
+> Failed: missing or misplaced { or }
+> Failed: "nonnumber" is not a number (in "hash" expansion)
+> Failed: Too many arguments for "hash" (max is 3)
+> Failed: "-2" is not a positive number (in "substr" expansion)
+> 
+> # Skipped operators
+> 
+> addrss: NO
+> domain: NO
+> escape: NO
+> expand: NO
+> hash:   NO
+> md5:    NO
+> mask:   NO
+> 
+> # Conditions
+> 
+> 2=2:    y
+> 2==2:   y
+> 3=2:    n
+> 2==3:   n
+> !2=2:   n
+> !2==2:  n
+> !3=2:   y
+> !2==3:  y
+> 2>3:    n
+> 3>3:    n
+> 4>3:    y
+> 2>=3:   n
+> 3>=3:   y
+> 4>=3:   y
+> 2<3:    y
+> 3<3:    n
+> 4<3:    n
+> 2<=3:   y
+> 3<=3:   y
+> 4<=3:   n
+> 5<=3:   n
+> 
+> 5>3k:   n
+> 5>3m:   n
+> Failed: "3z " is not a number
+> Failed: "a" is not a number
+> 
+> def:y   y
+> def:n   n
+> Failed: unknown variable "post" after "def:"
+> def:h_f n
+> def:h_f n
+> Failed: missing or misplaced { or }
+> 
+> exists: y
+> exists: n
+> 
+> eq:     y
+> eq:     n
+> !eq:    n
+> !eq:    y
+> 
+> eqi:    y
+> eqi:    y
+> eqi:    n
+> !eqi:   n
+> !eqi:   n
+> !eqi:   y
+> 
+> lt:     y
+> lti:    n
+> le:     y
+> lei:    y
+> gt:     n
+> gti:    n
+> ge:     n
+> gei:    y
+> 
+> isip:   y  1.2.3.4
+> isip4:  y  1.2.3.4
+> isip6:  n  1.2.3.4
+> isip:   n  1:2:3:4
+> isip4:  n  1:2:3:4
+> isip6:  n  1:2:3:4
+> isip:   y      ::1
+> isip4:  n      ::1
+> isip6:  y      ::1
+> isip:   y  fe80::a00:20ff:fe86:a061
+> isip4:  n  fe80::a00:20ff:fe86:a061
+> isip6:  y  fe80::a00:20ff:fe86:a061
+> isip:   n  rhubarb
+> isip4:  n  rhubarb
+> isip6:  n  rhubarb
+> 
+> match:  cdab
+> match:  cdab
+> match:  cdab
+> Failed: "if" failed and "fail" requested
+> match:  cd[xyz]ab
+> 
+> match_domain:    yes
+> match_domain:    no
+> match_domain:    yes
+> match_domain:    yes
+> match_domain:    no
+> 
+> match_address:   yes
+> match_address:   yes
+> 
+> match_local_part:yes
+> match_local_part:yes
+> 
+> match_ip:        01 true
+> match_ip:        02 
+> match_ip:        03 true
+> match_ip:        04 true
+> match_ip:        05 
+> match_ip:        06 
+> match_ip:        07 true
+> match_ip:        08 true
+> match_ip:        09 
+> match_ip:        10 true
+> Failed: "somename" is not an IP address
+> match_ip:        12 true
+> match_ip:        13 true
+> match_ip:        14 true
+> 
+> queue_running:  n
+> first_delivery: n
+> 
+> queue_running after or: y
+> first_delivery after or: y
+> 
+> # Default values for both if strings
+> 
+> ${if eq{1}{1}}  >true<
+> ${if eq{1}{2}}  ><
+> 
+> # Lookups: DIR is the testing directory. In this test we can only use the
+> # lookups that are required in all cases.
+> 
+> CALLER
+> 
+> ==X@Y
+> ==*
+> ==*@Z
+> ==*
+> 
+> data for a.b.c.d
+> failed x.y.z
+> data for *.p.q
+> data for *.p.q
+> data for *.p.q
+> Failed: "lookup" failed and "fail" requested
+> data for *
+> 
+> q1:  "abc"
+> q2:  "xyz":
+> q3:  "pqr"  :
+> q4:  "a:b" abc continued data (make sure not key)
+> q5:  "\"quoted\""
+> q6:  "white space"
+> q7:  "b\\s"
+> 
+> abc:   abc
+> a.b.c: *.b.c
+> ab.c:  *b.c
+> xyz:   ^X
+> Xyz:   ^X
+> Zyz:   ^Z
+> a b:   "^a +b"
+> a  b:  "^a +b"
+> a:b:   lookup succeeded
+> a.b:   ^a\\.+b
+> a..b:  ^a\\.+b
+> a9b:   \N^a\d+b
+> a99b:  \N^a\d+b
+> 
+> # Should give the same results as above because expansion does nothing
+> 
+> abc:   abc
+> a.b.c: *.b.c
+> ab.c:  *b.c
+> xyz:   ^X
+> Xyz:   ^X
+> Zyz:   ^Z
+> a b:   "^a +b"
+> a  b:  "^a +b"
+> a:b:   lookup succeeded
+> 
+> # Should fail because of no expansion
+> 
+> a.b:   NO
+> a..b:  NO
+> a9b:   NO
+> a99b:  NO
+> 
+> # But these should succeed
+> 
+> a\:b:  ^a\\.+b
+> a\:Xb: ^a\\.+b
+> 
+> # IP address (CIDR) lookups
+> 
+> 1.2.3.4:      data for 1.2.3.4
+> 1.2.3.5:      
+> 1.2.3.5:      data for *
+> abcd::cdab:   data for abcd::cdab
+> 192.168.1.2:  data for 192.168.0.0/16
+> 192.168.5.6:  data for 192.168.0.0/16
+> abcd:abcd::   data for abcd:abcd::/32
+> abcd:abcd:1:: data for abcd:abcd::/32
+> abcd:abcd::3  data for abcd:abcd::/32
+> Failed: lookup of "rhubarb" gave DEFER: "rhubarb" is not a valid iplsearch key (an IP address, with optional CIDR mask, is wanted): in a host list, use net-iplsearch as the search type
+> 
+> 
+> # Nested Lookups - style 1
+> 
+> The data for key1->key2
+> Failed: "lookup" failed and "fail" requested
+> 
+> # Nested Lookups - style 2
+> 
+> The data for key1->key2
+> failed for key4
+> 
+> # Other nesting tests
+> 
+> 1-in-1
+> 2-in-2
+> both-in-1,both-in-2
+> Failed: "lookup" failed and "fail" requested
+> 
+> # Lookup quotes for standardly expected lookups
+> 
+> lsearch  !@#$%^&*()_-+=|\~`1234567890{[}]qwertyuiop:;"'asdfghjkl<,>.?/zxcvbnm
+> Failed: unknown lookup type "xxx"
+> 
+> # Extract
+> 
+> 2
+> 2
+> 2
+> 2
+> Empty:<>
+> Empty:<>
+> <3>
+> <3>
+> Empty:<>
+> Empty:<>
+> no Z
+> no 4
+> Failed: "extract" failed and "fail" requested
+> Failed: "extract" failed and "fail" requested
+> D
+> a:b:c:d:e
+> a
+> e
+> a
+> FAIL
+> b
+> 
+> b
+> three four
+> Failed: first argument of "extract" must not be empty
+> Failed: first argument of "extract" must not be empty
+> b
+> 
+> # Translation
+> 
+> abcdea aaa xyz zbcdez
+> abcdea a   z   zbcdez
+> abcdea a       abcdea
+> abcdea abc z   zzzdez
+> 
+> # RFC 2047
+> 
+> abcd      abcd
+> <:abcd:>  =?iso-8859-8?Q?=3C=3Aabcd=3A=3E?=
+> <:ab cd:> =?iso-8859-8?Q?=3C=3Aab_cd=3A=3E?=
+> Long:     =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_i?= =?iso-8859-8?Q?t_will_go_over_the_75-char_limit?=
+> Long:     =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_i?= =?iso-8859-8?Q?t_will_go_over_the_75-char_limit_by_a_long_way=3B_in_fac?= =?iso-8859-8?Q?t_this_one_will_go_over_the_150_character_limit?=
+> 
+> 
+> # UTF-8
+> 
+> abcd      abcd
+> a��d      a��d
+> toobig    a_d
+> 
+> # Substitution
+> 
+> ${sg{abcdefabcdef}{abc}{xyz}}          =xyzdefxyzdef
+> ${sg{ab:xy::z}{:}{::}}                 =ab::xy::::z
+> ${sg{abcdefabcdef}{(..)[^c]}{>$1<}}    =a><><><ef
+> ${sg{abcdefabcdef}{(..)[^c]}{>\$1<}}   =a>bc<>ef<>bc<ef
+> ${sg{abcdefabcdef}{(..)[^c]}{>\N$1\N<}}=a>bc<>ef<>bc<ef
+> ${sg{abbab}{a*}{+}}                    =++b+b++b+
+> 
+> # File insertion
+> 
+> Failed: missing or misplaced { or }
+> abcde
+12345
+
+xyz
+
+> abcde12345xyz
+> abcde:12345::xyz:
+> abcde - 12345 -  - xyz - 
+> Failed: failed to open /non/exist/file: No such file or directory
+> non-exist
+> >abcde!12345!!xyz!<
+> 
+> # Calling a command
+> 
+> abcd
+1234
+
+> RC=0
+> 1
+> RC=0
+> abcd
+1234
+
+> RC=0
+> 2
+> RC=1
+> abcd
+1234
+
+> RC=1
+> N
+> RC=127
+> >><<
+> RC=0
+> 1!=2
+> RC=0
+> 
+> # PRVS
+> 
+> prvs=userx/xxxxxxxxxx@test.ex
+> prvs=userx/xxxxxxxxxx@test.ex
+> prvs=userx/xxxxxxxxxx@test.ex
+> 
+> # Syntax errors
+> 
+> Failed: prvs second argument must be a single digit
+> Failed: prvs second argument must be a single digit
+> Failed: prvs second argument must be a single digit
+> 
+> # Correct checks; can't put explicit addresses in the tests, because they
+> # will change over time.
+> 
+> userx@test.ex
+> result=1
+> 
+> >1< >userx@test.ex< >1<
+> result=1
+> 
+> userx@test.ex
+> result=1
+> 
+> # Incorrect secret
+> 
+> userx@test.ex
+> result=
+> 
+> 0
+> result=
+> 
+> # Non-prvs address
+> 
+> >><<
+> result=
+> 
+> # Syntax errors
+> 
+> Failed: "${tod_log" is not a known operator (or a } is missing in a variable reference)
+> Failed: "${tod_log" is not a known operator (or a } is missing in a variable reference)
+> Failed: missing } at end of string
+> Failed: missing } at end of string
+> Failed: hmac algorithm "xxx" is not recognised
+> Failed: each subcondition inside an "and{...}" condition must be in its own {}
+> Failed: unknown condition "xya" inside "and{...}" condition
+> Failed: condition name expected, but found "${lookup{x}lsear" inside "and{...}" condition
+> Failed: missing } at end of string - could be header name not terminated by colon
+> Failed: each subcondition inside an "or{...}" condition must be in its own {}
+> Failed: missing } at end of condition inside "or" group
+> Failed: unknown condition "yes" inside "or{...}" condition
+> Failed: non-digit after underscore in "substr_1_"
+> Failed: non-digit after underscore in "substr__3"
+> 
+> # Miscellaneous (for bug fixes, etc)
+> 
+> true
+> 
+> 
+> escape: B7�F2�
+> 
+> primary_hostname: myhost.test.ex
+> match:  cdab
+> Failed: "if" failed and "fail" requested
+> yes
+> match_address:   no
+> 
+> -oMa  sender_host_address = 
+>       sender_host_port = 0
+> -oMaa sender_host_authenticated = 
+> -oMai authenticated_id = CALLER
+> -oMas authenticated_sender = CALLER@myhost.test.ex
+> -oMi  interface_address = 
+>       interface_port = -1
+> -oMr  received_protocol = 
+> -oMs  sender_host_name = 
+> -oMt  sender_ident = CALLER
+> 
+> -oMa  sender_host_address = V4NET.0.0.1
+>       sender_host_port = 1234
+> -oMaa sender_host_authenticated = AAA
+> -oMai authenticated_id = philip
+> -oMas authenticated_sender = xx@yy.zz
+> -oMi  interface_address = 1.1.1.1
+>       interface_port = 99
+> -oMr  received_protocol = special
+> -oMt  sender_ident = me
+> 
+> -oMa  sender_host_address = V4NET.0.0.1
+>       sender_host_port = 1234
+> -oMs  sender_host_name = my.host.name
+> 
+> -oMs  sender_host_name = 
+>       host_lookup_failed = 1
+> 
+> -p  received_protocol = special
+> -p  sender_host_name = host.name
+> 
+> -oMa  sender_host_address = V4NET.0.0.1
+>       sender_host_port = 1234
+> -oMaa sender_host_authenticated = AAA
+> -oMai authenticated_id = philip
+> -oMas authenticated_sender = xx@yy.zz
+> -oMi  interface_address = 1.1.1.1
+>       interface_port = 99
+> -oMr  received_protocol = special
+> ----> No lookup yet: No
+> -oMs  sender_host_name = ten-1.test.ex
+> -oMt  sender_ident = me
+> 
+
+**** SMTP testing session as if from host V4NET.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+550 Administrative prohibition
+
+**** SMTP testing session as if from host V4NET.0.0.2
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+550 Administrative prohibition
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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
+550 reply_address=<>
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 reply_address=<a@b>
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 reply_address=<c@d>
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 reply_address=<>
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 reply_address=<x@y>
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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
+550 reply_address=<>
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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
+550 reply_address=<>
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0003 b/test/stdout/0003
new file mode 100644
index 000000000..517f59fe8
--- /dev/null
+++ b/test/stdout/0003
@@ -0,0 +1,106 @@
+
+**** SMTP testing session as if from host 1.1.1.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 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+421 the.local.host.name lost input connection
diff --git a/test/stdout/0004 b/test/stdout/0004
new file mode 100644
index 000000000..5595b3183
--- /dev/null
+++ b/test/stdout/0004
@@ -0,0 +1,114 @@
+
+**** SMTP testing session as if from host 1.1.1.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 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+421 the.local.host.name lost input connection
diff --git a/test/stdout/0005 b/test/stdout/0005
new file mode 100644
index 000000000..19cdc6c3e
--- /dev/null
+++ b/test/stdout/0005
@@ -0,0 +1,18 @@
+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
+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=10HmaY-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
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+221 the.local.host.name closing connection
diff --git a/test/stdout/0007 b/test/stdout/0007
new file mode 100644
index 000000000..4247830db
--- /dev/null
+++ b/test/stdout/0007
@@ -0,0 +1,4 @@
+501 malformed address: < may not follow someone@some.where
+Transaction started in line 0
+Error detected in line 1
+mail from:someone@some.where<
diff --git a/test/stdout/0008 b/test/stdout/0008
new file mode 100644
index 000000000..0370715df
--- /dev/null
+++ b/test/stdout/0008
@@ -0,0 +1,4 @@
+501 malformed address: < may not follow someone@some.where
+Transaction started in line 11
+Error detected in line 12
+mail from:someone@some.where<
diff --git a/test/stdout/0009 b/test/stdout/0009
new file mode 100644
index 000000000..5a484aca3
--- /dev/null
+++ b/test/stdout/0009
@@ -0,0 +1,4 @@
+501 '>' missing at end of address
+Transaction started in line 10
+Error detected in line 12
+rcpt to:<blackhole@the.local.host.name
diff --git a/test/stdout/0010 b/test/stdout/0010
new file mode 100644
index 000000000..1c96d5191
--- /dev/null
+++ b/test/stdout/0010
@@ -0,0 +1,3 @@
+421 Lost incoming connection
+Transaction started in line 10
+Error detected in line 18
diff --git a/test/stdout/0011 b/test/stdout/0011
new file mode 100644
index 000000000..ae50ee287
--- /dev/null
+++ b/test/stdout/0011
@@ -0,0 +1,3 @@
+421 Lost incoming connection
+Transaction started in line 10
+Error detected in line 14
diff --git a/test/stdout/0014 b/test/stdout/0014
new file mode 100644
index 000000000..10aae73d6
--- /dev/null
+++ b/test/stdout/0014
@@ -0,0 +1,94 @@
+  sender: userx@myhost.test.ex
+    from: userx@myhost.test.ex
+      to: userx@myhost.test.ex
+      cc: userx@myhost.test.ex
+     bcc: userx@myhost.test.ex
+reply-to: userx@myhost.test.ex
+env-from: userx@myhost.test.ex
+  env-to: userx@myhost.test.ex
+  sender: aaa@bbb
+    from: aaa@bbb
+      to: aaa@bbb
+      cc: aaa@bbb
+     bcc: aaa@bbb
+reply-to: aaa@bbb
+env-from: aaa@bbb
+  env-to: aaa@bbb
+  sender: 1=@zziggly
+    from: 1=@zziggly
+      to: 1=@zziggly
+      cc: 1=@zziggly
+     bcc: 1=@zziggly
+reply-to: 1=@zziggly
+env-from: 1=@zziggly
+  env-to: 1=@zziggly
+  sender: 1=no@zzince
+    from: 1=no@zzince
+      to: 1=no@zzince
+      cc: 1=no@zzince
+     bcc: 1=no@zzince
+reply-to: 1=no@zzince
+env-from: 1=no@zzince
+  env-to: 1=no@zzince
+  sender: admin@plc.example (root@box1)
+    from: admin@plc.example (root@box1)
+      to: admin@plc.example (root@box1)
+      cc: admin@plc.example (root@box1)
+     bcc: admin@plc.example (root@box1)
+reply-to: admin@plc.example (root@box1)
+env-from: admin@plc.example
+  env-to: unknown@plc.example
+  sender: J.Caesar@plc.example
+    from: J.Caesar@plc.example
+      to: J.Caesar@plc.example
+      cc: J.Caesar@plc.example
+     bcc: J.Caesar@plc.example
+reply-to: J.Caesar@plc.example
+env-from: J.Caesar@plc.example
+  env-to: J.Caesar@plc.example
+  sender: J.Calendar@plc.example
+    from: J.Calendar@plc.example
+      to: J.Calendar@plc.example
+      cc: J.Calendar@plc.example
+     bcc: J.Calendar@plc.example
+reply-to: J.Calendar@plc.example
+env-from: J.Calendar@plc.example
+  env-to: J.Calendar@plc.example
+  sender: jules@box3.plc.example
+    from: jules@box3.plc.example
+      to: unknown@plc.example
+      cc: unknown@plc.example
+     bcc: unknown@plc.example
+reply-to: jules@box3.plc.example
+env-from: "jules@box3.plc.example-is-not-known"@plc.example
+  env-to: unknown@plc.example
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Verification failed for <"jules@box3.plc.example-is-not-known"@plc.example>
+550-Unrouteable mail domain "plc.example"
+550 Sender verify failed
+221 myhost.test.ex closing connection
+  sender: abc@one.two
+    from: abc@one.two
+      to: abc@one.two
+      cc: abc@one.two
+     bcc: abc@one.two
+reply-to: abc@one.two
+env-from: abc@one.two
+  env-to: abc@one.two
+  sender: "abc"@one.two
+    from: "abc"@one.two
+      to: "abc"@one.two
+      cc: "abc"@one.two
+     bcc: "abc"@one.two
+reply-to: "abc"@one.two
+env-from: "abc"@one.two
+  env-to: "abc"@one.two
+  sender: "abc@xyz"@one.two
+    from: "abc@xyz"@one.two
+      to: "abc@xyz"@one.two
+      cc: "abc@xyz"@one.two
+     bcc: "abc@xyz"@one.two
+reply-to: "abc@xyz"@one.two
+env-from: "abc@xyz"@one.two
+  env-to: "abc@xyz"@one.two
diff --git a/test/stdout/0015 b/test/stdout/0015
new file mode 100644
index 000000000..d82e3cbc9
--- /dev/null
+++ b/test/stdout/0015
@@ -0,0 +1,52 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO the.local.host.name
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@Test.Ex>
+250 OK
+DATA
+300 go ahead
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmbE-0005vi-00
+	for S+userx@Test.Ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+More text.
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO the.local.host.name
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<Userx@Test.Ex>
+250 OK
+DATA
+300 go ahead
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmbG-0005vi-00
+	for Userx-S@Test.Ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+More text.
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0017 b/test/stdout/0017
new file mode 100644
index 000000000..c68f8b390
--- /dev/null
+++ b/test/stdout/0017
@@ -0,0 +1,24 @@
+
+**** SMTP testing session as if from host 1.1.1.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
+458 Administrative prohibition
+221 the.local.host.name closing connection
+
+**** SMTP testing session as if from host 10.9.8.7
+**** 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
+451 Temporary local problem - please try later
+221 the.local.host.name closing connection
+
+**** SMTP testing session as if from host 10.9.8.8
+**** 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
+451 Temporary local problem - please try later
+221 the.local.host.name closing connection
diff --git a/test/stdout/0018 b/test/stdout/0018
new file mode 100644
index 000000000..c3f2da09b
--- /dev/null
+++ b/test/stdout/0018
@@ -0,0 +1,8 @@
+
+**** 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 OK
+221 the.local.host.name closing connection
diff --git a/test/stdout/0019 b/test/stdout/0019
new file mode 100644
index 000000000..9649fee7f
--- /dev/null
+++ b/test/stdout/0019
@@ -0,0 +1,43 @@
+
+**** SMTP testing session as if from host 10.10.10.10
+**** 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
+501 Syntactically invalid HELO argument(s)
+500 unrecognized command
+500 unrecognized command
+500 unrecognized command
+221 the.local.host.name closing connection
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+501 Syntactically invalid HELO argument(s)
+500 unrecognized command
+500 unrecognized command
+500 unrecognized command
+221 the.local.host.name closing connection
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+501 argument must begin with #
+250-the.local.host.name Hello CALLER at a.b.c
+250-SIZE 52428800
+250-ETRN
+250-PIPELINING
+250 HELP
+503 sender not yet given
+250 OK
+503 valid RCPT command must precede DATA
+550 Administrative prohibition
+550 Administrative prohibition
+550 Administrative prohibition
+550 Administrative prohibition
+550 Administrative prohibition
+452 too many recipients
+452 too many recipients
+503 ETRN is not permitted inside a transaction
+250 Reset OK
+501 MAIL must have an address operand
+250 Reset OK
+250 OK
+503 sender already given
+501 RCPT must have an address operand
+250 Reset OK
+221 the.local.host.name closing connection
diff --git a/test/stdout/0020 b/test/stdout/0020
new file mode 100644
index 000000000..cf3448d8f
--- /dev/null
+++ b/test/stdout/0020
@@ -0,0 +1,7 @@
+
+**** SMTP testing session as if from host 10.250.104.7
+**** 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
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0021 b/test/stdout/0021
new file mode 100644
index 000000000..e09e72f1e
--- /dev/null
+++ b/test/stdout/0021
@@ -0,0 +1,18 @@
+550 Administrative prohibition
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+550 Administrative prohibition
+250 OK
+250 Accepted
+250 Accepted
+221 myhost.test.ex closing connection
+550 Administrative prohibition
+550 Administrative prohibition
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+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=10HmbF-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0022 b/test/stdout/0022
new file mode 100644
index 000000000..5a8c879dd
--- /dev/null
+++ b/test/stdout/0022
@@ -0,0 +1,220 @@
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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=10HmbF-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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=10HmbG-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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=10HmbH-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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
+451 forcibly deferred
+250 Accepted
+550 forcibly dropped
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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 host data >A host-specific message<
+550 host data >A host-specific message<
+550 host data >A host-specific message<
+550 host data >A host-specific message<
+221 myhost.test.ex closing connection
+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=10HmaX-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+250 OK
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+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
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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 forcibly dropped
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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 forcibly dropped
+ 0m   sss 10HmaX-0005vi-00 <CALLER@test.ex> *** frozen ***
+          accept@y
+          freeze@y
+
+ 0m   sss 10HmaZ-0005vi-00 <CALLER@test.ex>
+          queue_only@y
+          accept@y
+
+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
+>>> mail from:<x@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<accept@y>
+??? 250
+<<< 250 Accepted
+>>> rcpt to:<freeze@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Testing
+>>> .
+??? 250
+<<< 250 OK id=10HmbB-0005vi-00
+>>> mail from:<x@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<accept@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Testing 2
+>>> .
+??? 250
+<<< 250 OK id=10HmbC-0005vi-00
+>>> mail from:<x@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<queue_only@y>
+??? 250
+<<< 250 Accepted
+>>> rcpt to:<accept@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Testing 3
+>>> .
+??? 250
+<<< 250 OK id=10HmbD-0005vi-00
+>>> mail from:<x@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<accept@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Testing 4
+>>> .
+??? 250
+<<< 250 OK id=10HmbE-0005vi-00
+>>> mail from:<x@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<delay_accept@y>
+??? 250
+<<< 250 Accepted
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+ 0m   sss 10HmaX-0005vi-00 <CALLER@test.ex> *** frozen ***
+          accept@y
+          freeze@y
+
+ 0m   sss 10HmaZ-0005vi-00 <CALLER@test.ex>
+          queue_only@y
+          accept@y
+
+ 0m   sss 10HmbB-0005vi-00 <x@y> *** frozen ***
+          accept@y
+          freeze@y
+
+ 0m   sss 10HmbC-0005vi-00 <x@y>
+          accept@y
+
+ 0m   sss 10HmbD-0005vi-00 <x@y>
+          queue_only@y
+          accept@y
+
+ 0m   sss 10HmbE-0005vi-00 <x@y>
+          accept@y
+
diff --git a/test/stdout/0023 b/test/stdout/0023
new file mode 100644
index 000000000..b52b10b5e
--- /dev/null
+++ b/test/stdout/0023
@@ -0,0 +1,457 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+550 Administrative prohibition
+250 Accepted
+250 Accepted
+250 Accepted
+550 domain explicitly denied
+550 refuse.test.ex gets refused
+550 Administrative prohibition
+550 x@wontpass shall not pass
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 5.6.7.8
+**** 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 Administrative prohibition
+550 Administrative prohibition
+250 Accepted
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 9.9.9.9
+**** 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
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 9.9.9.8
+**** 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 don't like this host
+550 don't like this host
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 9.9.9.255
+**** 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
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 5.6.8.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 Administrative prohibition
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Accepted
+250 Reset OK
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 5.6.11.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
+250 Accepted
+550-"local part of wrong type
+550 (quotes are literal)
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 5.6.12.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
+550 failed nested acl
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 5.6.12.2
+**** 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
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 8.8.8.8
+**** 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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 5.6.13.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
+550 Administrative prohibition
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.11.12.13
+**** 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 host in DNS list rbl.test.ex: This is a test blacklisting message
+550 host in DNS list rbl.test.ex: This is a test blacklisting message
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.11.12.12
+**** 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
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 20.20.20.20
+**** 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 <x@y>
+550-Unrouteable address
+550 sender verify failure
+550 sender verify failure
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 20.20.20.20
+**** 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 recipient verify failure
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 21.21.21.21
+**** 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 Unrouteable address
+250 Accepted
+550 here is a fail message
+250 Reset OK
+250 OK
+550-Verification failed for <x@y>
+550-Unrouteable address
+550 Sender verify failed
+550 Sender verify failed
+250 Reset OK
+250 OK
+550-Verification failed for <fail@y>
+550-here is a fail message
+550 Sender verify failed
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 22.22.22.22
+**** 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 Administrative prohibition
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 23.23.23.0
+**** 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 <x@y>
+550-Unrouteable address
+550 sender must verify
+250 Reset OK
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 23.23.23.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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 24.24.24.24
+**** 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 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 25.25.25.25
+**** 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 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 26.26.26.26
+**** 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
+550 bounce messages can have only one recipient
+550 bounce messages can have only one recipient
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 27.27.27.27
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 28.28.28.28
+**** 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
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.3
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.97
+**** 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 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 29.29.29.29
+**** 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 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 30.30.30.30
+**** 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-domain=test.ex
+550-value=V4NET.0.0.1
+550 text=""
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550-domain=test.ex
+550-value=127.0.0.2
+550 text="This is a test blacklisting message"
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 31.31.31.31
+**** 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
+221 myhost.test.ex closing connection
+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 myhost.test.ex closing connection
+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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 33.33.33.33
+**** 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 sender verify failure
+550 sender verify failure
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 44.44.44.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
+221 myhost.test.ex closing connection
+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=10HmaZ-0005vi-00
+221 myhost.test.ex closing connection
+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
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbB-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbD-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbE-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbF-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbG-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbH-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbI-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbJ-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmbK-0005vi-00
+250 OK
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+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=10HmbL-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550 Administrative prohibition
+250 Accepted
+250 Accepted
+550 Administrative prohibition
+550 Administrative prohibition
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbM-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-ACL message for verification failure
+550 Original was >here is a fail message<
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550 host in DNS list rbl.test.ex: This is a test blacklisting message
+550 host in DNS list rbl.test.ex: This is a test blacklisting message
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0024 b/test/stdout/0024
new file mode 100644
index 000000000..4f340798b
--- /dev/null
+++ b/test/stdout/0024
@@ -0,0 +1,57 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550-Verification failed for <x@y>
+550-Unrouteable address
+550 Sender verify failed
+550 Sender verify failed
+550 Sender verify failed
+550 Sender verify failed
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+250 Accepted
+550 Unrouteable address
+250 Accepted
+550 relay not permitted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550 unknown user
+550 Unrouteable address
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550-rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
+550 This is a test blacklisting message
+550-rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
+550 This is a test blacklisting message
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbA-0005vi-00
+221 myhost.test.ex closing connection
+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
+250 OK id=10HmbB-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0025 b/test/stdout/0025
new file mode 100644
index 000000000..a31c2d211
--- /dev/null
+++ b/test/stdout/0025
@@ -0,0 +1,15 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Verification failed for <x@y>
+550-Unrouteable address
+550 Sender verify failed
+550 Sender verify failed
+550 Sender verify failed
+250 Reset OK
+250 OK
+250 Accepted
+550 Unrouteable address
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0026 b/test/stdout/0026
new file mode 100644
index 000000000..e02e9c7d3
--- /dev/null
+++ b/test/stdout/0026
@@ -0,0 +1,70 @@
+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=10HmbB-0005vi-00
+221 myhost.test.ex closing connection
+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
+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
+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
+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=10HmbC-0005vi-00
+221 myhost.test.ex closing connection
+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
+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=10HmbD-0005vi-00
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 10.0.0.0
+**** 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
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 10.0.0.0
+**** 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
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+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=10HmbE-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0027 b/test/stdout/0027
new file mode 100644
index 000000000..580296945
--- /dev/null
+++ b/test/stdout/0027
@@ -0,0 +1,38 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550 deny for userx
+550-Verification failed for <x@y>
+550-Unrouteable address
+550 Sender verify failed
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550 deny for userx
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+451 Temporary local problem - please try later
+451 Temporary local problem - please try later
+451 Temporary local problem - please try later
+451 Temporary local problem - please try later
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0028 b/test/stdout/0028
new file mode 100644
index 000000000..9bed3c34a
--- /dev/null
+++ b/test/stdout/0028
@@ -0,0 +1,14 @@
+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 message too big - $recipients=userx@test.ex (1)
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at Testing
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+550 SIZE value too big
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0029 b/test/stdout/0029
new file mode 100644
index 000000000..d523784db
--- /dev/null
+++ b/test/stdout/0029
@@ -0,0 +1,17 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550-Verification failed for <notok@abc.test.ex>
+550-Unrouteable address
+550 Sender verify failed
+250 Reset OK
+250 OK
+550-Verification failed for <notok@abc.test.ex>
+550-Unrouteable address
+550 Sender verify failed
+250 Reset OK
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0030 b/test/stdout/0030
new file mode 100644
index 000000000..e5b972dfa
--- /dev/null
+++ b/test/stdout/0030
@@ -0,0 +1,5 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550 >>data from accept router<<
+550 <<data from redirect router>>
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0033 b/test/stdout/0033
new file mode 100644
index 000000000..82aa1e93e
--- /dev/null
+++ b/test/stdout/0033
@@ -0,0 +1,58 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH PLAIN
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<one@remote>
+250 Recipient OK
+RCPT TO:<two@remote>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH PLAIN
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<one@remote>
+250 Recipient OK
+RCPT TO:<two@remote>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaY-0005vi-00
+	for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0034 b/test/stdout/0034
new file mode 100644
index 000000000..f38421fe9
--- /dev/null
+++ b/test/stdout/0034
@@ -0,0 +1,117 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 Reset OK
+250 Reset OK
+250 Reset OK
+250 Reset OK
+554 Too many nonmail commands
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at a.b.c
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250-myhost.test.ex Hello CALLER at a.b.c
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250-myhost.test.ex Hello CALLER at a.b.c
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250-myhost.test.ex Hello CALLER at a.b.c
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+554 Too many nonmail commands
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 Reset OK
+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
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at a.b.c
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbB-0005vi-00
+250-myhost.test.ex Hello CALLER at a.b.c
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+250-myhost.test.ex Hello CALLER at a.b.c
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbD-0005vi-00
+250-myhost.test.ex Hello CALLER at a.b.c
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250-myhost.test.ex Hello CALLER at a.b.c
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250-myhost.test.ex Hello CALLER at a.b.c
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250-myhost.test.ex Hello CALLER at a.b.c
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+554 Too many nonmail commands
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 OK
+250 OK
+554 Too many nonmail commands
+
+**** SMTP testing session as if from host 10.0.0.2
+**** 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 Reset OK
+250 Reset OK
+250 Reset OK
+250 Reset OK
+554 Too many nonmail commands
+
+**** SMTP testing session as if from host 10.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 Reset OK
+250 Reset OK
+250 Reset OK
+250 Reset OK
+250 Reset OK
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0035 b/test/stdout/0035
new file mode 100644
index 000000000..dfc44ed51
--- /dev/null
+++ b/test/stdout/0035
@@ -0,0 +1,286 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<notsubmit@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> mail from:<a@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmaZ-0005vi-00
+>>> mail from:<notsubmit@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Sender: sender@some.where
+>>> .
+??? 250
+<<< 250 OK id=10HmbA-0005vi-00
+>>> mail from:<a@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Sender: sender@some.where
+>>> .
+??? 250
+<<< 250 OK id=10HmbB-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<a@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Sender: sender@some.where
+>>> .
+??? 250
+<<< 250 OK id=10HmbC-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<a@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Sender: sender@some.where
+>>> .
+??? 250
+<<< 250 OK id=10HmbD-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+10HmaX-0005vi-00-H
+CALLER UID GID
+<notsubmit@y>
+ddddddddd 0
+-helo_name rhu.barb
+-host_address 127.0.0.1.9999
+-interface_address 127.0.0.1.1225
+-received_protocol esmtp
+-body_linecount 0
+-deliver_firsttime
+XX
+1
+x@y
+
+dddP Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtp (Exim x.yz)
+	(envelope-from <notsubmit@y>)
+	id 10HmaX-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+10HmaY-0005vi-00-H
+CALLER UID GID
+<a@y>
+ddddddddd 0
+-helo_name rhu.barb
+-host_address 127.0.0.1.9999
+-interface_address 127.0.0.1.1225
+-received_protocol esmtp
+-body_linecount 0
+-deliver_firsttime
+XX
+1
+x@y
+
+dddP Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtp (Exim x.yz)
+	(envelope-from <a@y>)
+	id 10HmaY-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+dddF From: a@y
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+10HmaZ-0005vi-00-H
+CALLER UID GID
+<>
+ddddddddd 0
+-helo_name rhu.barb
+-host_address 127.0.0.1.9999
+-interface_address 127.0.0.1.1225
+-received_protocol esmtp
+-body_linecount 0
+-deliver_firsttime
+XX
+1
+x@y
+
+dddP Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtp (Exim x.yz)
+	id 10HmaZ-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+10HmbA-0005vi-00-H
+CALLER UID GID
+<notsubmit@y>
+ddddddddd 0
+-helo_name rhu.barb
+-host_address 127.0.0.1.9999
+-interface_address 127.0.0.1.1225
+-received_protocol esmtp
+-body_linecount 0
+-deliver_firsttime
+XX
+1
+x@y
+
+dddP Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtp (Exim x.yz)
+	(envelope-from <notsubmit@y>)
+	id 10HmbA-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+dddS Sender: sender@some.where
+10HmbB-0005vi-00-H
+CALLER UID GID
+<a@y>
+ddddddddd 0
+-helo_name rhu.barb
+-host_address 127.0.0.1.9999
+-interface_address 127.0.0.1.1225
+-received_protocol esmtp
+-body_linecount 0
+-deliver_firsttime
+XX
+1
+x@y
+
+dddP Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtp (Exim x.yz)
+	(envelope-from <a@y>)
+	id 10HmbB-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+ddd* Sender: sender@some.where
+047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+dddF From: a@y
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+10HmbC-0005vi-00-H
+CALLER UID GID
+<a@y>
+ddddddddd 0
+-helo_name rhu.barb
+-host_address 127.0.0.1.9999
+-interface_address 127.0.0.1.1225
+-received_protocol esmtp
+-body_linecount 0
+-deliver_firsttime
+XX
+1
+x@y
+
+dddP Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtp (Exim x.yz)
+	(envelope-from <a@y>)
+	id 10HmbC-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+dddS Sender: sender@some.where
+047I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+dddF From: a@y
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+10HmbD-0005vi-00-H
+CALLER UID GID
+<a@y>
+ddddddddd 0
+-helo_name rhu.barb
+-host_address 127.0.0.1.9999
+-interface_address 127.0.0.1.1225
+-received_protocol esmtp
+-body_linecount 0
+-deliver_firsttime
+XX
+1
+x@y
+
+dddP Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtp (Exim x.yz)
+	(envelope-from <a@y>)
+	id 10HmbD-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+ddd* Sender: sender@some.where
+047I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
+dddF From: SomeName <a@y>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0037 b/test/stdout/0037
new file mode 100644
index 000000000..a6643e466
--- /dev/null
+++ b/test/stdout/0037
@@ -0,0 +1,259 @@
+Warning: no message headers read
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-1"
+
+Add 1 to n3
+Add 3 to n4
+Add 1 to n4
+Add 4 to n4
+Add 6 to n1
+Testprint: n0=0 n1=6 n3=1 n4=8
+Testprint: /\n
+Deliver message to: root@test.ex
+Save message to: /tmp/the.local.host.name 0444
+Save message to: /tmp/test.ex
+Pipe message to: /tmp/$primary_hostname
+Logfile /tmp/logfile
+Logwrite "this is log text: test.ex\n"
+Testprint: yes
+Testprint: yes
+Testprint: yes
+Testprint: yes
+Testprint: no
+Testprint: no
+Testprint: qualify_domain is qualify_domain
+Testprint: qualify_domain IS qualify_domain
+Testprint: NOT qualify_domain is not qualify_domain
+Testprint: NOT qualify_domain IS NOT qualify_domain
+Filtering set up at least one significant delivery or other action.
+No other deliveries will occur.
+Warning: no message headers read
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-2"
+
+Filter error: errors_to must point to the caller's address
+Warning: no message headers read
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-3"
+
+Deliver message to: root@test.ex errors_to root@the.local.host.name
+Testprint: End
+Filtering set up at least one significant delivery or other action.
+No other deliveries will occur.
+Warning: no message headers read
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Not personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Warning: no message headers read
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Not personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Not personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Not personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Not personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Not personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Not personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Not personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Not personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Not personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Not personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = anon@ymous
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-4"
+
+Testprint: Personal
+Testprint: $home = CALLER_HOME
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Warning: no message headers read
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-6"
+
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Warning: no message headers read
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-var/0037.f-7"
+
+Testprint: Testing <
+Testprint: >abcd|xyz<
+Testprint: no
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Warning: no message headers read
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-5"
+
+Testprint: Before fail
+Fail text "This is a forced failure"
+Filtering ended by "fail".
+ 0m   sss 10HmbA-0005vi-00 <CALLER@test.ex> *** frozen ***
+          userx@test.ex
+       +D system-filter
+       +D userz@test.ex
+
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-var/0037.F"
+
+Testprint: message_size      = 186
+Testprint: message_body_size = 137
+Testprint: body_linecount    = 2
+Testprint: message_body      = This is the body of 
+Testprint: message_body_end  = ible in the filter. 
+Logfile TESTSUITE/spool/log/mainlog
+Logwrite "1999-03-02 09:44:33 10HmcC-0005vi-00 "message for filter test" first delivery\n"
+Headers add "X-added: qualify_domain is test.ex"
+Headers remove "remove-this"
+Unseen deliver message to: userz@test.ex errors_to abcd@test.ex
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-var/0037.F"
+
+Testprint: ------------------------------------------------
+Testprint: Test-headers: first one\nFrom: x@y\nTest-headers: another one\nMore-test-headers : yet another one\nSubject: testing, testing\nMessage-Id: <E10HmcD-0005vi-00@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000
+Testprint: ------------------------------------------------
+Headers remove "test-headers:more-test-headers"
+Headers add "added-header: this is added\nadded-header2: a second line"
+Testprint: From: x@y\nSubject: testing, testing\nMessage-Id: <E10HmcD-0005vi-00@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000\nadded-header: this is added\nadded-header2: a second line
+Testprint: ------------------------------------------------
+Testprint: message_size      = 122
+Testprint: message_body_size = 0
+Testprint: body_linecount    = 0
+Testprint: message_body      = 
+Testprint: message_body_end  = 
+Logfile TESTSUITE/spool/log/mainlog
+Logwrite "1999-03-02 09:44:33 10HmcD-0005vi-00 "testing, testing" first delivery\n"
+Headers add "X-added: qualify_domain is test.ex"
+Headers remove "remove-this"
+Unseen deliver message to: userz@test.ex errors_to abcd@test.ex
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
diff --git a/test/stdout/0038 b/test/stdout/0038
new file mode 100644
index 000000000..4ff984306
--- /dev/null
+++ b/test/stdout/0038
@@ -0,0 +1,77 @@
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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-myhost.test.ex Hello test.ex [V4NET.9.8.7]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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-myhost.test.ex Hello test.ex [V4NET.9.8.7]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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-myhost.test.ex Hello test.ex [V4NET.9.8.7]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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-myhost.test.ex Hello test.ex [V4NET.9.8.7]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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-myhost.test.ex Hello test.ex [V4NET.9.8.7]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+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
diff --git a/test/stdout/0041 b/test/stdout/0041
new file mode 100644
index 000000000..d43b4501a
--- /dev/null
+++ b/test/stdout/0041
@@ -0,0 +1,21 @@
+
+**** SMTP testing session as if from host 1.1.1.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
+252 Administrative prohibition
+550 Administrative prohibition
+221 the.local.host.name closing connection
+
+**** SMTP testing session as if from host 2.2.2.2
+**** 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-<userx@test.ex>
+250 <usery@test.ex>
+221 the.local.host.name closing connection
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+550 Administrative prohibition
+221 the.local.host.name closing connection
diff --git a/test/stdout/0042 b/test/stdout/0042
new file mode 100644
index 000000000..76d3552bc
--- /dev/null
+++ b/test/stdout/0042
@@ -0,0 +1,9 @@
+
+**** SMTP testing session as if from host 1.1.1.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 <userx@test.ex> is deliverable
+550 <junkjunk@test.ex> Unrouteable address
+221 the.local.host.name closing connection
diff --git a/test/stdout/0043 b/test/stdout/0043
new file mode 100644
index 000000000..d6bc76bd6
--- /dev/null
+++ b/test/stdout/0043
@@ -0,0 +1,20 @@
+
+**** SMTP testing session as if from host V4NET.0.0.97
+**** 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 exim.test.ex [V4NET.0.0.97]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+550-Verification failed for <junkjunk@exim.test.ex>
+550-Unrouteable address
+550 Sender verify failed
+250 Reset OK
+250 OK
+250 Accepted
+550 unrouteable address
+550 unrouteable address
+221 the.local.host.name closing connection
diff --git a/test/stdout/0044 b/test/stdout/0044
new file mode 100644
index 000000000..626031e2c
--- /dev/null
+++ b/test/stdout/0044
@@ -0,0 +1,37 @@
+
+**** SMTP testing session as if from host V4NET.11.12.13
+**** 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 exim.test.ex [V4NET.11.12.13]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+550 host is listed in rbl.test.ex
+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 the.local.host.name closing connection
+
+**** SMTP testing session as if from host V4NET.11.12.13
+**** 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 exim.test.ex [V4NET.11.12.13]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+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 the.local.host.name closing connection
diff --git a/test/stdout/0045 b/test/stdout/0045
new file mode 100644
index 000000000..3f0ffa0bb
--- /dev/null
+++ b/test/stdout/0045
@@ -0,0 +1,33 @@
+userx@eximtesthost.test.ex cannot be resolved at this time:
+  remote host address is the local host
+userx@mxt1.test.ex cannot be resolved at this time:
+  lowest numbered MX record points to local host
+userx@mxt2.test.ex is undeliverable:
+  all relevant MX records point to non-existent hosts
+userx@mxt3.test.ex is undeliverable:
+  all relevant MX records point to non-existent hosts
+userx@mxt4.test.ex cannot be resolved at this time:
+  lowest numbered MX record points to local host
+userx@mxt5.test.ex cannot be resolved at this time:
+  lowest numbered MX record points to local host
+userx@mxt5.test.ex cannot be resolved at this time:
+  lowest numbered MX record points to local host
+userx@mxt6.test.ex
+  router = lookuphost, transport = smtp
+  host ten-1.test.ex [V4NET.0.0.1] MX=5
+userx@mxt7.test.ex
+  router = lookuphost, transport = smtp
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+userx@mxt7.test.ex
+  router = lookuphost, transport = smtp
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+userx@mxt8.test.ex
+  router = lookuphost, transport = smtp
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+userx@mxt8.test.ex
+  router = lookuphost, transport = smtp
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
diff --git a/test/stdout/0046 b/test/stdout/0046
new file mode 100644
index 000000000..c1a01b533
--- /dev/null
+++ b/test/stdout/0046
@@ -0,0 +1,60 @@
+Warning: no message headers read
+Return-path copied from sender
+Sender      = usery@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0046.filter.userx"
+
+Testprint: Body: This message has quite a short body, so both variables should end up containing the same amount of data. 
+Testprint: End:  This message has quite a short body, so both variables should end up containing the same amount of data. 
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Warning: no message headers read
+Return-path copied from sender
+Sender      = usery@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0046.filter.userx"
+
+Testprint: Body: This message has a long body, more than 500 characters, so the start and end variables should end up containing different character strings.  The quick brown fox jumps over the lazy dog. Pack my box with five dozen liquor jugs.  See! The second of those is shorter, but also contains all 26 letters of the alphabet, and also makes some kind of sense. Now is the time for all good men to come to the aid of the party. 'Twas brillig and the slithy toves did gyre and gimble in the wabe, all mimsy were 
+Testprint: End:  nd variables should end up containing different character strings.  The quick brown fox jumps over the lazy dog. Pack my box with five dozen liquor jugs.  See! The second of those is shorter, but also contains all 26 letters of the alphabet, and also makes some kind of sense. Now is the time for all good men to come to the aid of the party. 'Twas brillig and the slithy toves did gyre and gimble in the wabe, all mimsy were the borogoves, and the mome raths outgrabe. There, that should be enough. 
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Warning: no message headers read
+Return-path copied from sender
+Sender      = usery@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0046.filter.userx"
+
+Testprint: Body: This message has a long body, more than 500 characters, so the start and end variables should end up containing different character strings.  The quick brown fox jumps over the lazy dog. Pack my box with five dozen liquor jugs. . . See! The second of those is shorter, but also contains all 26 letters of the alphabet, and also makes some kind of sense. Now is the time for all good men to come to the aid of the party. 'Twas brillig and the slithy toves did gyre and gimble in the wabe, all mimsy we
+Testprint: End:  variables should end up containing different character strings.  The quick brown fox jumps over the lazy dog. Pack my box with five dozen liquor jugs. . . See! The second of those is shorter, but also contains all 26 letters of the alphabet, and also makes some kind of sense. Now is the time for all good men to come to the aid of the party. 'Twas brillig and the slithy toves did gyre and gimble in the wabe, all mimsy were the borogoves, and the mome raths outgrabe. There, that should be enough. 
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Warning: no message headers read
+Return-path copied from sender
+Sender      = usery@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0046.filter.userx"
+
+Testprint: Body: This message has a long body, more than 500 characters, so the start and end variables should end up containing different character strings.  . The quick brown fox jumps over the lazy dog. . Pack my box with five dozen liquor jugs.  See! The second of those is shorter, but also contains all 26 letters of the alphabet, and also makes some kind of sense. Now is the time for all good men to come to the aid of the party. 'Twas brillig and the slithy toves did gyre and gimble in the wabe, all mimsy w
+Testprint: End:  ariables should end up containing different character strings.  . The quick brown fox jumps over the lazy dog. . Pack my box with five dozen liquor jugs.  See! The second of those is shorter, but also contains all 26 letters of the alphabet, and also makes some kind of sense. Now is the time for all good men to come to the aid of the party. 'Twas brillig and the slithy toves did gyre and gimble in the wabe, all mimsy were the borogoves, and the mome raths outgrabe. There, that should be enough. 
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Warning: no message headers read
+Return-path copied from sender
+Sender      = usery@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0046.filter.userx"
+
+Testprint: Body: Here's a body with a NULL( ) in it. That should become a space. 
+Testprint: End:  Here's a body with a NULL( ) in it. That should become a space. 
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Warning: no message headers read
+Return-path copied from sender
+Sender      = usery@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0046.filter.userx"
+
+Testprint: Body: This message has a long body, more than 500 characters, so the start and end variables should end up containing different character strings.  The quick brown fox jumps over the lazy dog. NULL( ) Pack my box with five dozen liquor jugs. NULL( )  See! The second of those is shorter, but also contains all 26 letters of the alphabet, and also makes some kind of sense. Now is the time for all good men to come to the aid of the party. 'Twas brillig and the slithy toves did gyre and gimble in the wabe,
+Testprint: End:  up containing different character strings.  The quick brown fox jumps over the lazy dog. NULL( ) Pack my box with five dozen liquor jugs. NULL( )  See! The second of those is shorter, but also contains all 26 letters of the alphabet, and also makes some kind of sense. Now is the time for all good men to come to the aid of the party. 'Twas brillig and the slithy toves did gyre and gimble in the wabe, all mimsy were the borogoves, and the mome raths outgrabe. NULL( ) There, that should be enough. 
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
diff --git a/test/stdout/0047 b/test/stdout/0047
new file mode 100644
index 000000000..258578d9a
--- /dev/null
+++ b/test/stdout/0047
@@ -0,0 +1,9 @@
+xx@domain1
+  router = domainlist, transport = smtp
+  host ten-1.test.ex [V4NET.0.0.1] 
+xx@route1.ex
+  router = domainlist, transport = smtp
+  host ten-2.test.ex [V4NET.0.0.2] 
+xx@domain3
+  router = domainlist, transport = smtp
+  host ten-3.test.ex [V4NET.0.0.3] 
diff --git a/test/stdout/0049 b/test/stdout/0049
new file mode 100644
index 000000000..152cfdb8c
--- /dev/null
+++ b/test/stdout/0049
@@ -0,0 +1,12 @@
+220 myhost.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=10HmbB-0005vi-00
+221 myhost.ex closing connection
+220 myhost.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=10HmbG-0005vi-00
+221 myhost.ex closing connection
diff --git a/test/stdout/0050 b/test/stdout/0050
new file mode 100644
index 000000000..1fc341806
--- /dev/null
+++ b/test/stdout/0050
@@ -0,0 +1,12 @@
+220 myhost.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=10HmbB-0005vi-00
+221 myhost.ex closing connection
+220 myhost.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=10HmbH-0005vi-00
+221 myhost.ex closing connection
diff --git a/test/stdout/0053 b/test/stdout/0053
new file mode 100644
index 000000000..686ba5cf7
--- /dev/null
+++ b/test/stdout/0053
@@ -0,0 +1,5 @@
+userx@test.ex
+    <-- bar@domain1.ex
+  router = localuser, transport = local_delivery
+foobar@domain1.ex is undeliverable:
+  Unrouteable address
diff --git a/test/stdout/0054 b/test/stdout/0054
new file mode 100644
index 000000000..50737244a
--- /dev/null
+++ b/test/stdout/0054
@@ -0,0 +1,5 @@
+xxx@ten-1.test.ex
+  router = lookuphost, transport = smtp
+  host ten-1.test.ex [V4NET.0.0.1] 
+xxx@ten-2.test.ex is undeliverable:
+  Unrouteable address
diff --git a/test/stdout/0056 b/test/stdout/0056
new file mode 100644
index 000000000..b9acb02f2
--- /dev/null
+++ b/test/stdout/0056
@@ -0,0 +1,16 @@
+
+**** SMTP testing session as if from host V4NET.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.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
+250 OK id=10HmaX-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.ex closing connection
diff --git a/test/stdout/0057 b/test/stdout/0057
new file mode 100644
index 000000000..306090755
--- /dev/null
+++ b/test/stdout/0057
@@ -0,0 +1,25 @@
+
+**** SMTP testing session as if from host V4NET.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550 relay not permitted
+550 relay not permitted
+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.ex closing connection
+userx%myhost.ex@a.test.ex failed to verify:
+  Unrouteable address
+userx%myhost.ex@b.test.ex failed to verify:
+  Unrouteable address
+userx%myhost.ex@d.test.ex failed to verify:
+  Unrouteable address
+userx%myhost.ex@d.test.ex failed to verify:
+  Unrouteable address
+userx%myhost.ex@z.test.ex verified
diff --git a/test/stdout/0058 b/test/stdout/0058
new file mode 100644
index 000000000..7be895339
--- /dev/null
+++ b/test/stdout/0058
@@ -0,0 +1,21 @@
+
+**** SMTP testing session as if from host V4NET.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.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!
+
+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.ex closing connection
diff --git a/test/stdout/0059 b/test/stdout/0059
new file mode 100644
index 000000000..a8ee4d5ef
--- /dev/null
+++ b/test/stdout/0059
@@ -0,0 +1,15 @@
+
+**** SMTP testing session as if from host V4NET.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550 relay not permitted
+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.ex closing connection
diff --git a/test/stdout/0060 b/test/stdout/0060
new file mode 100644
index 000000000..b240bf8a7
--- /dev/null
+++ b/test/stdout/0060
@@ -0,0 +1,120 @@
+
+**** SMTP testing session as if from host V4NET.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.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=10HmaX-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.2
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550 relay not permitted
+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.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.5
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.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=10HmaZ-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.6
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.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=10HmbA-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.ex closing connection
+
+**** SMTP testing session as if from host V4NET.255.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550 relay not permitted
+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 myhost.ex closing connection
+
+**** SMTP testing session as if from host V4NET.255.0.2
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550 relay not permitted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.ex closing connection
+
+**** SMTP testing session as if from host V4NET.255.0.3
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550 relay not permitted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbD-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.ex closing connection
+
+**** SMTP testing session as if from host V4NET.255.0.4
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550 relay not permitted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbE-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.ex closing connection
diff --git a/test/stdout/0061 b/test/stdout/0061
new file mode 100644
index 000000000..4ea10b08f
--- /dev/null
+++ b/test/stdout/0061
@@ -0,0 +1,30 @@
+
+**** SMTP testing session as if from host V4NET.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 ten-1.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=10HmaX-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 ten-1.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.2
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 ten-1.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550 relay not permitted
+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 ten-1.test.ex closing connection
diff --git a/test/stdout/0062 b/test/stdout/0062
new file mode 100644
index 000000000..0a709b747
--- /dev/null
+++ b/test/stdout/0062
@@ -0,0 +1,45 @@
+
+**** SMTP testing session as if from host V4NET.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
+550 relay not permitted
+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 V4NET.0.0.2
+**** 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
+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
+
+**** SMTP testing session as if from host V4NET.0.0.3
+**** 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
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0063 b/test/stdout/0063
new file mode 100644
index 000000000..f9a486d52
--- /dev/null
+++ b/test/stdout/0063
@@ -0,0 +1,30 @@
+
+**** SMTP testing session as if from host V4NET.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
+550 relay not permitted
+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 V4NET.0.0.2
+**** 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
+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/0064 b/test/stdout/0064
new file mode 100644
index 000000000..f9a486d52
--- /dev/null
+++ b/test/stdout/0064
@@ -0,0 +1,30 @@
+
+**** SMTP testing session as if from host V4NET.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
+550 relay not permitted
+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 V4NET.0.0.2
+**** 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
+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/0065 b/test/stdout/0065
new file mode 100644
index 000000000..10b3f28b0
--- /dev/null
+++ b/test/stdout/0065
@@ -0,0 +1,105 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+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 1.2.3.5
+**** 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
+550 relay not permitted
+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
+
+**** SMTP testing session as if from host 1.2.4.5
+**** 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
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.3.2.4
+**** 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
+550 relay not permitted
+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!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 131.111.8.2
+**** 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
+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 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 192.152.98.3
+**** 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
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 192.153.98.4
+**** 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
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbD-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0066 b/test/stdout/0066
new file mode 100644
index 000000000..2553bbf4c
--- /dev/null
+++ b/test/stdout/0066
@@ -0,0 +1,135 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+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 1.2.3.5
+**** 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
+550 relay not permitted
+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
+
+**** SMTP testing session as if from host 1.2.4.5
+**** 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
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.3.2.4
+**** 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
+550 relay not permitted
+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!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 131.111.8.2
+**** 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
+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 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 192.152.98.3
+**** 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
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.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
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbD-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.11.12.13
+**** 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
+550 relay not permitted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbE-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.3
+**** 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
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbF-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0067 b/test/stdout/0067
new file mode 100644
index 000000000..78ae9110e
--- /dev/null
+++ b/test/stdout/0067
@@ -0,0 +1,99 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Accepted
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0068 b/test/stdout/0068
new file mode 100644
index 000000000..f974140d6
--- /dev/null
+++ b/test/stdout/0068
@@ -0,0 +1,16 @@
+
+**** SMTP testing session as if from host V4NET.10.10.10
+**** 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 OK
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+552 too many recipients
+552 too many recipients
+554 Too many recipients
+221 the.local.host.name closing connection
diff --git a/test/stdout/0069 b/test/stdout/0069
new file mode 100644
index 000000000..52d0db340
--- /dev/null
+++ b/test/stdout/0069
@@ -0,0 +1,45 @@
+
+**** SMTP testing session as if from host V4NET.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 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.13
+**** 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 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.13
+**** 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 "Denied"
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.13
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.13
+**** 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 "Denied"
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0070 b/test/stdout/0070
new file mode 100644
index 000000000..36c9d3580
--- /dev/null
+++ b/test/stdout/0070
@@ -0,0 +1,104 @@
+
+**** SMTP testing session as if from host V4NET.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
+503 HELO or EHLO required
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.13
+**** 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 helo not verified
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.2
+**** 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 myhost.test.ex Hello [V4NET.0.0.1] [V4NET.0.0.2]
+250 OK
+550 helo not verified
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.2
+**** 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 myhost.test.ex Hello [V4NET.0.0.2] [V4NET.0.0.2]
+250 OK
+550 helo did verify
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.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 myhost.test.ex Hello ten-1.test.ex [V4NET.0.0.1]
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.3
+**** 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 myhost.test.ex Hello ten-3.test.ex [V4NET.0.0.3]
+250 myhost.test.ex Hello ten-3.test.ex [V4NET.0.0.3]
+250 myhost.test.ex Hello ten-3.test.ex [V4NET.0.0.3]
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.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
+550 EHLO argument does not match calling host
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 99.99.99.99
+**** 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
+451 EHLO argument does not match calling host
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.13
+**** 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 myhost.test.ex Hello [V4NET.0.0.99] [V4NET.0.0.13]
+250 OK
+550 helo not verified
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.13
+**** 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 myhost.test.ex Hello [V4NET.0.0.13] [V4NET.0.0.13]
+250 OK
+550 helo did verify
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 99.99.99.99
+**** 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-myhost.test.ex Hello rhubarb [99.99.99.99]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+550 helo not verified
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0077 b/test/stdout/0077
new file mode 100644
index 000000000..83096cb89
--- /dev/null
+++ b/test/stdout/0077
@@ -0,0 +1,27 @@
+
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.10.10.10
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.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 Administrative prohibition
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0078 b/test/stdout/0078
new file mode 100644
index 000000000..6d8b4a0e5
--- /dev/null
+++ b/test/stdout/0078
@@ -0,0 +1,11 @@
+xx@mxt6.test.ex
+  router = lookuphost, transport = remote_smtp
+  host ten-1.test.ex [V4NET.0.0.1] MX=5
+myhost.test.ex@mxt1.test.ex
+  router = self, transport = remote_smtp
+  host myhost.test.ex [V4NET.10.10.10] 
+xx@mxt1.test.ex
+  router = self2, transport = remote_smtp
+  host myhost.test.ex [V4NET.10.10.10] 
+xx@not.exist is undeliverable:
+  Unrouteable address
diff --git a/test/stdout/0079 b/test/stdout/0079
new file mode 100644
index 000000000..d8317a6e0
--- /dev/null
+++ b/test/stdout/0079
@@ -0,0 +1,46 @@
+
+**** SMTP testing session as if from host V4NET.11.12.14
+**** 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 exim.test.ex [V4NET.11.12.14]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+550 host is listed in rbl2.test.ex
+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
+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 exim.test.ex [V4NET.11.12.13]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+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
+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 exim.test.ex [V4NET.11.12.14]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+550 host is listed in rbl2.test.ex
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-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
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+221 the.local.host.name closing connection
diff --git a/test/stdout/0080 b/test/stdout/0080
new file mode 100644
index 000000000..32babff73
--- /dev/null
+++ b/test/stdout/0080
@@ -0,0 +1,19 @@
+
+**** SMTP testing session as if from host V4NET.11.12.14
+**** 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 exim.test.ex [V4NET.11.12.14]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+550 host is listed in rbl.test.ex
+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 the.local.host.name closing connection
diff --git a/test/stdout/0084 b/test/stdout/0084
new file mode 100644
index 000000000..623a7ea57
--- /dev/null
+++ b/test/stdout/0084
@@ -0,0 +1,5 @@
+userx@test.ex
+    <-- yes@myhost.test.ex
+  router = localuser, transport = unset
+no@myhost.test.ex
+  router = smart, transport = unset
diff --git a/test/stdout/0085 b/test/stdout/0085
new file mode 100644
index 000000000..f02de8bc8
--- /dev/null
+++ b/test/stdout/0085
@@ -0,0 +1,16 @@
+x@y.z failed to verify:
+  unrouteable mail domain "y.z"
+x@smart.domain
+  router = smart1, transport = unset
+x@test.ex
+  router = smart2, transport = dummy
+x@myhost.test.ex failed to verify:
+  Unrouteable address
+x@y.z failed to verify:
+  unrouteable mail domain "y.z"
+x@smart.domain failed to verify:
+  unrouteable mail domain "smart.domain"
+x@test.ex failed to verify:
+  Unrouteable address
+x@myhost.test.ex failed to verify:
+  Unrouteable address
diff --git a/test/stdout/0086 b/test/stdout/0086
new file mode 100644
index 000000000..b32918349
--- /dev/null
+++ b/test/stdout/0086
@@ -0,0 +1,69 @@
+
+**** SMTP testing session as if from host V4NET.10.10.10
+**** 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
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.10.10.10
+**** 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
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.10.10.10
+**** 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
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.10.10.10
+**** 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
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.10.10.10
+**** 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
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.10.10.9
+**** 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
diff --git a/test/stdout/0087 b/test/stdout/0087
new file mode 100644
index 000000000..f9dd36747
--- /dev/null
+++ b/test/stdout/0087
@@ -0,0 +1,64 @@
+
+**** SMTP testing session as if from host V4NET.10.10.10
+**** 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 V4NET.10.10.10
+**** 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
+
+**** SMTP testing session as if from host V4NET.10.10.10
+**** 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
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.10.10.10
+**** 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=10HmaZ-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.10.10.10
+**** 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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0088 b/test/stdout/0088
new file mode 100644
index 000000000..74ab08e62
--- /dev/null
+++ b/test/stdout/0088
@@ -0,0 +1,6 @@
+xx@ten-1.test.ex cannot be resolved at this time:
+  remote host address is the local host
+xx@ten-99.test.ex cannot be resolved at this time:
+  remote host address is the local host
+xx@mxcased.test.ex cannot be resolved at this time:
+  lowest numbered MX record points to local host
diff --git a/test/stdout/0089 b/test/stdout/0089
new file mode 100644
index 000000000..916f0acb5
--- /dev/null
+++ b/test/stdout/0089
@@ -0,0 +1,37 @@
+userx@test.ex
+  router = localuser, transport = dummy
+userx@myhost.test.ex
+  router = localuser, transport = dummy
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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
+501 Syntactically invalid HELO argument(s)
+250 myhost.test.ex Hello abc_xyz [V4NET.0.0.0]
+250 OK
+250 Accepted
+550 relay not permitted
+250 Reset OK
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.99
+**** 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 myhost.test.ex Hello ten-99.test.ex [V4NET.0.0.99]
+250 OK
+250 Accepted
+550 relay not permitted
+221 myhost.test.ex closing connection
+abcd@test.ex
+  router = select, transport = dummy
+ABCD@test.ex
+  router = select, transport = dummy
+XYZ@ten-1.test.ex
+  router = manual, transport = dummy
+  host ten-1.test.ex [V4NET.0.0.1] 
+xyz@ten-1.test.ex is undeliverable:
+  unrouteable mail domain "ten-1.test.ex"
diff --git a/test/stdout/0091 b/test/stdout/0091
new file mode 100644
index 000000000..10cf780a9
--- /dev/null
+++ b/test/stdout/0091
@@ -0,0 +1,49 @@
+
+**** SMTP testing session as if from host V4NET.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
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.2
+**** 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 <junk@jink.jonk.test.ex>
+550-Unrouteable address
+550 Sender verify failed
+503 valid RCPT command must precede DATA
+500 unrecognized command
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.2
+**** 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
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.2
+**** 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
diff --git a/test/stdout/0092 b/test/stdout/0092
new file mode 100644
index 000000000..3656b9120
--- /dev/null
+++ b/test/stdout/0092
@@ -0,0 +1,39 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+421 myhost.test.ex: SMTP command timeout - closing connection
+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
+421 myhost.test.ex SMTP incoming data timeout - closing connection.
+
+**** SMTP testing session as if from host V4NET.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
+421 myhost.test.ex: SMTP command timeout - closing connection
+
+**** SMTP testing session as if from host V4NET.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
+421 myhost.test.ex SMTP incoming data timeout - closing connection.
+
+**** SMTP testing session as if from host V4NET.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 unrouteable address
+421 myhost.test.ex: SMTP command timeout - closing connection
+421 SMTP command timeout
+Transaction started in line 0
+Error detected in line 0
+421 SMTP incoming data timeout - message abandoned
+Transaction started in line 0
+Error detected in line 3
diff --git a/test/stdout/0093 b/test/stdout/0093
new file mode 100644
index 000000000..4762c64ac
--- /dev/null
+++ b/test/stdout/0093
@@ -0,0 +1,46 @@
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-var/0093.f-1"
+
+Testprint: yes
+Testprint: no
+Testprint: yes
+Testprint: yes
+Testprint: yes
+Testprint: data for key1
+Testprint: body_linecount=3
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Warning: no message headers read
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-var/0093.f-2"
+
+Filter error: failed to expand "${if eq {1}{0}{yes}{${lookup{key1}lsearch{TESTSUITE/aux-fixed/junkjunk}{$value}{notfound}}}}" in testprint command: failed to open TESTSUITE/aux-fixed/junkjunk for linear search: No such file or directory
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0093.f-3"
+
+Testprint: From: is defined
+Testprint: Absent: is not defined
+Testprint: ----------------------
+Testprint: From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000
+Testprint: ----------------------
+Testprint: From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000+++more
+Testprint: ----------------------
+Testprint: +++From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000+++
+Testprint: ----------------------
+Testprint: From: >a@b<
+Testprint: this header is repeated\n          and continued\nthis header is repeated\n          and continued\nthis header is repeated\n          and continued
+Testprint: ----------------------
+Testprint: +++this header is repeated\n          and continued\nthis header is repeated\n          and continued\nthis header is repeated\n          and continued+++
+Testprint: ----------------------
+Testprint: reply_address=x@y
+Testprint: empty=><
+Testprint: repeated-empty=><
+Testprint: ----------------------
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
diff --git a/test/stdout/0094 b/test/stdout/0094
new file mode 100644
index 000000000..475cfa047
--- /dev/null
+++ b/test/stdout/0094
@@ -0,0 +1,46 @@
+
+**** SMTP testing session as if from host V4NET.11.12.13
+**** 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 OK
+550 relay not permitted
+221 the.local.host.name closing connection
+
+**** SMTP testing session as if from host V4NET.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 OK
+550 relay not permitted
+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
+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 session as if from host V4NET.99.99.90
+**** 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 OK
+250 Accepted
+550 relay not permitted
+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
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-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
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+221 the.local.host.name closing connection
diff --git a/test/stdout/0098 b/test/stdout/0098
new file mode 100644
index 000000000..59dcdba55
--- /dev/null
+++ b/test/stdout/0098
@@ -0,0 +1,4 @@
+Message 10HmaX-0005vi-00 has been removed
+Message 10HmaZ-0005vi-00 has been removed
+Message 10HmbB-0005vi-00 has been removed
+Message 10HmbD-0005vi-00 has been removed
diff --git a/test/stdout/0099 b/test/stdout/0099
new file mode 100644
index 000000000..2cb1e2437
--- /dev/null
+++ b/test/stdout/0099
@@ -0,0 +1,23 @@
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 60
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 60
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 60
+Retry rule: *.star.ex  *  F,3d,10m; 
+Retry rule: lsearch*@;TESTSUITE/aux-fixed/0099.rlist  *  F,1d,3m; 
+Retry rule: *  *  F,2d,15m; 
+Retry rule: *@\N^\d  *  F,5d,1m; 
+Retry rule: *@*.abcd.ex  *  F,5d,2m; 
+Retry rule: *@literal.ex  *  F,5d,3m; 
+Retry rule: *@lsearch;TESTSUITE/aux-fixed/0099.rlist2  *  F,5d,4m; 
+Retry rule: *@@[]  *  F,5d,5m; 
+Retry rule: *@@  *  F,5d,6m; 
+Retry rule: rcpt4xx.test.ex  *  F,1w3d,1m; 
+Retry rule: rcpt45x.test.ex  *  F,1w3d,2m; 
+Retry rule: rcpt463.test.ex  *  F,1w3d,3m; 
+Retry rule: *  *  G,1d,1m,1.5; 
+Retry rule: *  *  G,2d,2m,1.5; 
diff --git a/test/stdout/0100 b/test/stdout/0100
new file mode 100644
index 000000000..f4c25d7e5
--- /dev/null
+++ b/test/stdout/0100
@@ -0,0 +1,63 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmbD-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+..dotheader: This is perfectly legal
+Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+A message containing
+.. a line starting with a dot
+... and one starting with two dots
+..
+The previous one contains only a dot.
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@filtered.com>
+250 Recipient OK
+DATA
+354 Send data
+X-Filtered: just checking
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmbM-0005vi-00
+	for userx@filtered.com; Tue, 2 Mar 1999 09:44:33 +0000
+..dotheader: This is perfectly legal
+Message-Id: <E10HmbM-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+A message containing
+.. a line starting with a dot
+... and one starting with two dots
+..
+The previous one contains only a dot.
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0101 b/test/stdout/0101
new file mode 100644
index 000000000..c5e6a37c3
--- /dev/null
+++ b/test/stdout/0101
@@ -0,0 +1,32 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmbB-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+..dotheader: This is perfectly legal
+Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+A message containing
+.. a line starting with a dot
+... and one starting with two dots
+..
+The previous one contains only a dot.
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0104 b/test/stdout/0104
new file mode 100644
index 000000000..ebb1e6310
--- /dev/null
+++ b/test/stdout/0104
@@ -0,0 +1,6 @@
+xxx@test.ex
+  router = all, transport = appendfile
+xxx@test.ex
+  router = all, transport = appendfile
+xxx@test.ex
+  router = all, transport = appendfile
diff --git a/test/stdout/0106 b/test/stdout/0106
new file mode 100644
index 000000000..eae5bd5ae
--- /dev/null
+++ b/test/stdout/0106
@@ -0,0 +1,16 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+*sleep 4
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+*sleep 4
+End of script
diff --git a/test/stdout/0117 b/test/stdout/0117
new file mode 100644
index 000000000..989213e19
--- /dev/null
+++ b/test/stdout/0117
@@ -0,0 +1,6 @@
+xxx@mxt9.test.ex
+  router = lookuphost, transport = unset
+xxx@mxt9a.test.ex
+  router = lookuphost, transport = unset
+xxx@mxt9b.test.ex
+  router = lookuphost, transport = unset
diff --git a/test/stdout/0121 b/test/stdout/0121
new file mode 100644
index 000000000..7ef5e4024
--- /dev/null
+++ b/test/stdout/0121
@@ -0,0 +1,32 @@
+
+**** 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 OK
+550-Verification failed for <unknown@test.ex>
+550-Unrouteable address
+550 Sender verify failed
+250 Reset OK
+250 OK
+550-Verification failed for <userx@unknown.dom.ain>
+550-unrouteable mail domain "unknown.dom.ain"
+550 Sender verify failed
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+250 OK
+451 Temporary local problem - please try later
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+451 Temporary local problem - please try later
+221 the.local.host.name closing connection
diff --git a/test/stdout/0123 b/test/stdout/0123
new file mode 100644
index 000000000..4a1f3051b
--- /dev/null
+++ b/test/stdout/0123
@@ -0,0 +1,6 @@
+x@test.ex is undeliverable:
+  Unrouteable address
+y@test.ex is undeliverable:
+  Unrouteable address
+z@test.ex is undeliverable:
+  Unrouteable address
diff --git a/test/stdout/0124 b/test/stdout/0124
new file mode 100644
index 000000000..f04d70439
--- /dev/null
+++ b/test/stdout/0124
@@ -0,0 +1,12 @@
+
+**** SMTP testing session as if from host V4NET.0.0.97
+**** 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 OK
+550 relay not permitted
+250 Reset OK
+250 OK
+550 relay not permitted
+221 the.local.host.name closing connection
diff --git a/test/stdout/0126 b/test/stdout/0126
new file mode 100644
index 000000000..a522b8a2d
--- /dev/null
+++ b/test/stdout/0126
@@ -0,0 +1,2 @@
+userx@test.ex is undeliverable:
+  Unrouteable address
diff --git a/test/stdout/0127 b/test/stdout/0127
new file mode 100644
index 000000000..152cfdb8c
--- /dev/null
+++ b/test/stdout/0127
@@ -0,0 +1,12 @@
+220 myhost.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=10HmbB-0005vi-00
+221 myhost.ex closing connection
+220 myhost.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=10HmbG-0005vi-00
+221 myhost.ex closing connection
diff --git a/test/stdout/0129 b/test/stdout/0129
new file mode 100644
index 000000000..648a03433
--- /dev/null
+++ b/test/stdout/0129
@@ -0,0 +1,4 @@
+xxx@test.ex failed to verify:
+  Just testing
+xxx@one.test.ex failed to verify:
+  Just testing
diff --git a/test/stdout/0130 b/test/stdout/0130
new file mode 100644
index 000000000..9a807d39e
--- /dev/null
+++ b/test/stdout/0130
@@ -0,0 +1,11 @@
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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 OK
+451 Temporary local problem - please try later
+221 the.local.host.name closing connection
+userx@not.test.ex cannot be resolved at this time:
+  remote host address is the local host
diff --git a/test/stdout/0136 b/test/stdout/0136
new file mode 100644
index 000000000..80398903a
--- /dev/null
+++ b/test/stdout/0136
@@ -0,0 +1,14 @@
+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=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=10HmbA-0005vi-00
+221 the.local.host.name closing connection
diff --git a/test/stdout/0137 b/test/stdout/0137
new file mode 100644
index 000000000..07baa99b8
--- /dev/null
+++ b/test/stdout/0137
@@ -0,0 +1,14 @@
+exim_lock: lockname =  test-mail/userx.lock
+           hitchname = test-mail/userx.lock.test.ex.dddddddd.pppppppp
+exim_lock: creating lock file
+exim_lock: lock file successfully created
+exim_lock: fcntl() lock successfully applied
+exim_lock: locking test-mail/userx succeeded: running SHELL ...
+exim_lock: test-mail/userx closed
+exim_lock: lock file removed
+exim_lock: fcntl() lock successfully applied
+exim_lock: locking test-mail/userx succeeded: running SHELL ...
+exim_lock: test-mail/userx closed
+exim_lock: fcntl() lock successfully applied
+exim_lock: locking test-mail/userx succeeded: running SHELL ...
+exim_lock: test-mail/userx closed
diff --git a/test/stdout/0138 b/test/stdout/0138
new file mode 100644
index 000000000..7a08c4a2a
--- /dev/null
+++ b/test/stdout/0138
@@ -0,0 +1,37 @@
+
+**** SMTP testing session as if from host V4NET.11.12.14
+**** 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 exim.test.ex [V4NET.11.12.14]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+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 the.local.host.name closing connection
+
+**** SMTP testing session as if from host V4NET.11.12.13
+**** 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 exim.test.ex [V4NET.11.12.13]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+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 the.local.host.name closing connection
diff --git a/test/stdout/0139 b/test/stdout/0139
new file mode 100644
index 000000000..748852cce
--- /dev/null
+++ b/test/stdout/0139
@@ -0,0 +1,46 @@
+
+**** SMTP testing session as if from host V4NET.11.12.14
+**** 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 OK
+250 Accepted
+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 the.local.host.name closing connection
+
+**** SMTP testing session as if from host V4NET.11.12.15
+**** 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 OK
+550-host is listed in rbl3.test.ex with value 127.0.0.3
+550-This is a very long blacklisting message, continuing for ages and ages and
+550-certainly being longer than 128 characters which was a previous limit on
+550 the length that Exim was prepared to handle.
+503 valid RCPT command must precede DATA
+500 unrecognized command
+500 unrecognized command
+221 the.local.host.name closing connection
+
+**** SMTP testing session as if from host V4NET.11.12.20
+**** 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 OK
+221 the.local.host.name closing connection
+
+**** SMTP testing session as if from host V4NET.11.12.21
+**** 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 OK
+221 the.local.host.name closing connection
diff --git a/test/stdout/0141 b/test/stdout/0141
new file mode 100644
index 000000000..0acddabd8
--- /dev/null
+++ b/test/stdout/0141
@@ -0,0 +1,6 @@
+xxx@test.ex failed to verify:
+  Forced failure
+xxx@test.ex is undeliverable:
+  Forced failure
+xxx@test.ex failed to verify:
+  Unrouteable address
diff --git a/test/stdout/0143 b/test/stdout/0143
new file mode 100644
index 000000000..1075fed7f
--- /dev/null
+++ b/test/stdout/0143
@@ -0,0 +1,28 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [ip4.ip4.ip4.ip4]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH LOGIN
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0145 b/test/stdout/0145
new file mode 100644
index 000000000..206a430c7
--- /dev/null
+++ b/test/stdout/0145
@@ -0,0 +1,26 @@
+x@mxt10.test.ex is undeliverable:
+  all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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 <x@mxt10.test.ex>
+550-It appears that the DNS operator for mxt10.test.ex
+550-has installed an invalid MX record with an IP address
+550-instead of a domain name on the right hand side.
+550 Sender verify failed
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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-It appears that the DNS operator for mxt10.test.ex
+550-has installed an invalid MX record with an IP address
+550 instead of a domain name on the right hand side.
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0146 b/test/stdout/0146
new file mode 100644
index 000000000..953a87442
--- /dev/null
+++ b/test/stdout/0146
@@ -0,0 +1,3 @@
+x@mxt10.test.ex
+  router = domainlist, transport = smtp
+  host V4NET.0.0.1 [V4NET.0.0.1] MX=5
diff --git a/test/stdout/0147 b/test/stdout/0147
new file mode 100644
index 000000000..34ba8bd9c
--- /dev/null
+++ b/test/stdout/0147
@@ -0,0 +1,61 @@
+percent_hack_domains = phack1.ex :
+hold_domains = aeb :c.d
+queue_domains = abcdx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx123456789012345678901234567890
+host_lookup = abcdx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx123456789012345678901234567890 + abcdx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx123456789012345678901234567890
+queue_smtp_domains = x#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx123456789012345678901234567890 + x#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx123456789012345678901234567890
+hosts_treat_as_local = abcdxyz and abcd + abcdxyz
+ignore_fromline_hosts = test.ex : test2.ex :test3.ex
+delay_warning_condition = abcdxyz plus extra + 1234
+  sender: x@junk.junk
+    from: x@junk.junk
+      to: x@else.where
+      cc: x@else.where
+     bcc: x@junk.junk
+reply-to: x@junk.junk
+env-from: x@junk.junk
+  env-to: x@junk.junk
+Retry rule: *  *  F,1h,15m; F,1d,30m; 
+address_data = 
+address_test
+cannot_route_message = 
+no_caseful_local_part
+no_check_local_user
+condition = 
+debug_print = 
+no_disable_logging
+domains = 
+driver = accept
+errors_to = 
+expn
+no_fail_verify_recipient
+no_fail_verify_sender
+fallback_hosts = 
+group = 
+headers_add = 
+headers_remove = 
+ignore_target_hosts = 
+no_initgroups
+local_part_prefix = 
+no_local_part_prefix_optional
+local_part_suffix = 
+no_local_part_suffix_optional
+local_parts = 
+log_as_local
+more
+no_pass_on_timeout
+pass_router = 
+redirect_router = 
+require_files = 
+no_retry_use_local_part
+router_home_directory = new macro2 + 1234
+self = freeze
+senders = 
+transport = T1
+transport_current_directory = 
+transport_home_directory = 
+no_unseen
+user = 
+no_verify_only
+verify_recipient
+verify_sender
+550 testing,testing
diff --git a/test/stdout/0149 b/test/stdout/0149
new file mode 100644
index 000000000..81d36d35c
--- /dev/null
+++ b/test/stdout/0149
@@ -0,0 +1,14 @@
+x@ten
+  router = domainlist1, transport = unset
+y@two
+  router = domainlist1, transport = unset
+x@test1
+  router = local, transport = local_delivery
+x@test2
+  router = local, transport = local_delivery
+x@test3-4
+  router = local, transport = local_delivery
+x@one
+  router = domainlist2, transport = unset
+x@six
+  router = domainlist2, transport = unset
diff --git a/test/stdout/0153 b/test/stdout/0153
new file mode 100644
index 000000000..93a2bd705
--- /dev/null
+++ b/test/stdout/0153
@@ -0,0 +1,9 @@
+abcd@test.ex verified
+yes@exists.virt.test.ex verified
+no@exists.virt.test.ex failed to verify:
+  Unrouteable address
+xx@notexists.virt.test.ex failed to verify:
+  Unrouteable address
+yes@list.test.ex verified
+no@list.test.ex failed to verify:
+  Unrouteable address
diff --git a/test/stdout/0154 b/test/stdout/0154
new file mode 100644
index 000000000..272078b57
--- /dev/null
+++ b/test/stdout/0154
@@ -0,0 +1,30 @@
+ 0m   sss 10HmaX-0005vi-00 <CALLER@test.ex>
+          a@test.ex
+
+ 0m   sss 10HmaY-0005vi-00 <CALLER@test.ex>
+          b@test.ex
+
+ 0m   sss 10HmaZ-0005vi-00 <CALLER@test.ex>
+          c@test.ex
+
+ 0m   sss 10HmbA-0005vi-00 <CALLER@test.ex>
+          d@test.ex
+
+ 0m   sss 10HmbB-0005vi-00 <CALLER@test.ex>
+          e@test.ex
+
+ 0m   sss 10HmbC-0005vi-00 <CALLER@test.ex>
+          f@test.ex
+
+ 0m   sss 10HmbD-0005vi-00 <CALLER@test.ex>
+          g@test.ex
+
+ 0m   sss 10HmbE-0005vi-00 <CALLER@test.ex>
+          h@test.ex
+
+ 0m   sss 10HmbF-0005vi-00 <CALLER@test.ex>
+          i@test.ex
+
+ 0m   sss 10HmbG-0005vi-00 <CALLER@test.ex>
+          j@test.ex
+
diff --git a/test/stdout/0155 b/test/stdout/0155
new file mode 100644
index 000000000..272078b57
--- /dev/null
+++ b/test/stdout/0155
@@ -0,0 +1,30 @@
+ 0m   sss 10HmaX-0005vi-00 <CALLER@test.ex>
+          a@test.ex
+
+ 0m   sss 10HmaY-0005vi-00 <CALLER@test.ex>
+          b@test.ex
+
+ 0m   sss 10HmaZ-0005vi-00 <CALLER@test.ex>
+          c@test.ex
+
+ 0m   sss 10HmbA-0005vi-00 <CALLER@test.ex>
+          d@test.ex
+
+ 0m   sss 10HmbB-0005vi-00 <CALLER@test.ex>
+          e@test.ex
+
+ 0m   sss 10HmbC-0005vi-00 <CALLER@test.ex>
+          f@test.ex
+
+ 0m   sss 10HmbD-0005vi-00 <CALLER@test.ex>
+          g@test.ex
+
+ 0m   sss 10HmbE-0005vi-00 <CALLER@test.ex>
+          h@test.ex
+
+ 0m   sss 10HmbF-0005vi-00 <CALLER@test.ex>
+          i@test.ex
+
+ 0m   sss 10HmbG-0005vi-00 <CALLER@test.ex>
+          j@test.ex
+
diff --git a/test/stdout/0156 b/test/stdout/0156
new file mode 100644
index 000000000..357aa68c3
--- /dev/null
+++ b/test/stdout/0156
@@ -0,0 +1,7 @@
+defer@test.ex cannot be resolved at this time:
+  error in redirect data: ":defer: forced to defer" is not permitted
+file@test.ex -> /dev/null *** forbidden ***
+include@test.ex cannot be resolved at this time:
+  error in redirect data: included files not permitted
+unknown@test.ex is undeliverable:
+  Unrouteable address
diff --git a/test/stdout/0157 b/test/stdout/0157
new file mode 100644
index 000000000..30530c15a
--- /dev/null
+++ b/test/stdout/0157
@@ -0,0 +1,36 @@
+
+**** SMTP testing session as if from host V4NET.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 OK
+550 invalid sender
+250 Reset OK
+250 OK
+250 Accepted
+221 the.local.host.name closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.2
+**** 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 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+221 the.local.host.name closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.3
+**** 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 OK
+550 relay not permitted
+250 Reset OK
+250 OK
+550 relay not permitted
+221 the.local.host.name closing connection
diff --git a/test/stdout/0159 b/test/stdout/0159
new file mode 100644
index 000000000..cbb1cc67b
--- /dev/null
+++ b/test/stdout/0159
@@ -0,0 +1,103 @@
+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 [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-myhost.test.ex Hello [ip4.ip4.ip4.ip4] [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> To: userx@test.ex
+>>> 
+>>> EHLO [ip4.ip4.ip4.ip4]
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> ehlo [IPV4:ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-myhost.test.ex Hello [IPV4:ip4.ip4.ip4.ip4] [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> To: userx@test.ex
+>>> 
+>>> EHLO [IPV4:ip4.ip4.ip4.ip4]
+>>> .
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
+>>> ehlo ip4.ip4.ip4.ip4
+??? 250-
+<<< 250-myhost.test.ex Hello ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> To: userx@test.ex
+>>> 
+>>> EHLO ip4.ip4.ip4.ip4
+>>> .
+??? 250
+<<< 250 OK id=10HmaZ-0005vi-00
+>>> ehlo [V4NET.1.2.3]
+??? 250-
+<<< 250-myhost.test.ex Hello [V4NET.1.2.3] [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> To: userx@test.ex
+>>> 
+>>> EHLO [V4NET.1.2.3]
+>>> .
+??? 250
+<<< 250 OK id=10HmbA-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/0160 b/test/stdout/0160
new file mode 100644
index 000000000..f757ae5af
--- /dev/null
+++ b/test/stdout/0160
@@ -0,0 +1,28 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userx@domain.com>
+452 Temporary error
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userx@domain.com>
+452 Temporary error
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0161 b/test/stdout/0161
new file mode 100644
index 000000000..45a72f4f5
--- /dev/null
+++ b/test/stdout/0161
@@ -0,0 +1,15 @@
+xx@mxt6.test.ex
+  router = lookuphost, transport = remote_smtp
+  host ten-1.test.ex [V4NET.0.0.1] MX=5
+myhost.test.ex@mxt1.test.ex
+  router = self, transport = remote_smtp
+  host myhost.test.ex [V4NET.10.10.10] 
+xx@mxt1.test.ex
+  router = self2, transport = remote_smtp
+  host myhost.test.ex [V4NET.10.10.10] 
+xx@not.exist is undeliverable:
+  Unrouteable address
+ff@mxt1.test.ex is undeliverable:
+  lowest numbered MX record points to local host
+fff@mxt1.test.ex is undeliverable:
+  lookup of host "fff" failed in fail router
diff --git a/test/stdout/0162 b/test/stdout/0162
new file mode 100644
index 000000000..985c5a31c
--- /dev/null
+++ b/test/stdout/0162
@@ -0,0 +1,6 @@
+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
diff --git a/test/stdout/0163 b/test/stdout/0163
new file mode 100644
index 000000000..8e8832381
--- /dev/null
+++ b/test/stdout/0163
@@ -0,0 +1,25 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+350 Send message
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+550 There is a problem with the message, but this response line is over the limit for reasonable SMTP responses. 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890
+Unexpected EOF read from client
diff --git a/test/stdout/0167 b/test/stdout/0167
new file mode 100644
index 000000000..5b67e707f
--- /dev/null
+++ b/test/stdout/0167
@@ -0,0 +1,16 @@
+  sender: error@test.ex
+    from: error@test.ex
+      to: error@test.ex
+      cc: error@test.ex
+     bcc: error@test.ex
+reply-to: error@test.ex
+env-from: <>
+  env-to: error@test.ex
+  sender: remove@test.ex
+    from: remove@test.ex
+      to: remove@test.ex
+      cc: remove@test.ex
+     bcc: remove@test.ex
+reply-to: remove@test.ex
+env-from: <>
+  env-to: remove@test.ex
diff --git a/test/stdout/0172 b/test/stdout/0172
new file mode 100644
index 000000000..9520bb415
--- /dev/null
+++ b/test/stdout/0172
@@ -0,0 +1,2 @@
+unknown@test.ex is undeliverable:
+  cannot route address
diff --git a/test/stdout/0175 b/test/stdout/0175
new file mode 100644
index 000000000..92280840f
--- /dev/null
+++ b/test/stdout/0175
@@ -0,0 +1,36 @@
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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 OK
+550 Sender verify failed
+503 valid RCPT command must precede DATA
+500 unrecognized command
+221 the.local.host.name closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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 OK
+550 Sender verify failed
+503 valid RCPT command must precede DATA
+500 unrecognized command
+221 the.local.host.name closing connection
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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 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 the.local.host.name closing connection
diff --git a/test/stdout/0176 b/test/stdout/0176
new file mode 100644
index 000000000..8250f6616
--- /dev/null
+++ b/test/stdout/0176
@@ -0,0 +1,2 @@
+Message 10HmaX-0005vi-00 is now frozen
+Message 10HmaX-0005vi-00 is no longer frozen
diff --git a/test/stdout/0177 b/test/stdout/0177
new file mode 100644
index 000000000..f558f08d2
--- /dev/null
+++ b/test/stdout/0177
@@ -0,0 +1,36 @@
+ 0m   sss 10HmbA-0005vi-00 <CALLER@test.ex> *** frozen ***
+          userx@test.ex
+       +D >usery:userx@test.ex
+
+ 0m   sss 10HmbG-0005vi-00 <CALLER@test.ex> *** frozen ***
+          userz@test.ex
+
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@non.local.domain>
+250 Recipient OK
+DATA
+350 Send message
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmbG-0005vi-00
+	for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Subject: freeze this (3)
+Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a third message to be frozen.
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0179 b/test/stdout/0179
new file mode 100644
index 000000000..9013698df
--- /dev/null
+++ b/test/stdout/0179
@@ -0,0 +1,43 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+350 Send message
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<abcd@domain.com>
+250 Recipient OK
+DATA
+350 Send message
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaY-0005vi-00
+	for abcd@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0180 b/test/stdout/0180
new file mode 100644
index 000000000..bd9ea0bbc
--- /dev/null
+++ b/test/stdout/0180
@@ -0,0 +1,50 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at some.host
+250-SIZE 100
+250-PIPELINING
+250 HELP
+552 Message size exceeds maximum permitted
+250 Reset OK
+452 Space shortage, please try later
+250 Reset OK
+452 Space shortage, please try later
+250 Reset OK
+552 Message size exceeds maximum permitted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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-myhost.test.ex Hello some.host [1.2.3.4]
+250-SIZE 500
+250-PIPELINING
+250 HELP
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 5.6.7.8
+**** 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-myhost.test.ex Hello some.host [5.6.7.8]
+250-SIZE 600
+250-PIPELINING
+250 HELP
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at some.host
+250-SIZE 100
+250-PIPELINING
+250 HELP
+552 Message size exceeds maximum permitted
+250 Reset OK
+250 OK
+250 Reset OK
+250 OK
+250 Reset OK
+552 Message size exceeds maximum permitted
+250 Reset OK
+552 Message size exceeds maximum permitted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0181 b/test/stdout/0181
new file mode 100644
index 000000000..5645abefc
--- /dev/null
+++ b/test/stdout/0181
@@ -0,0 +1,10 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at some.host
+250-SIZE 100
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+552 Message size exceeds maximum permitted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0183 b/test/stdout/0183
new file mode 100644
index 000000000..7582da94e
--- /dev/null
+++ b/test/stdout/0183
@@ -0,0 +1,46 @@
+userx@test.again.dns cannot be resolved at this time:
+  host lookup did not complete
+abcd@test.again.dns cannot be resolved at this time:
+  host lookup did not complete
+abcd@ten-1.test.ex
+  router = lookuphost, transport = smtp
+  host ten-1.test.ex [V4NET.0.0.1] 
+usery@test.again.dns cannot be resolved at this time:
+  host lookup for test.again.dns did not complete (DNS timeout?)
+userz@test.again.dns cannot be resolved at this time:
+  host lookup for test.again.dns did not complete (DNS timeout?)
+xyz@ten-1.test.ex
+  router = lookuphost, transport = smtp
+  host ten-1.test.ex [V4NET.0.0.1] 
+userx@test.fail.dns cannot be resolved at this time:
+  host lookup did not complete
+abcd@test.fail.dns cannot be resolved at this time:
+  host lookup did not complete
+abcd@ten-1.test.ex
+  router = lookuphost, transport = smtp
+  host ten-1.test.ex [V4NET.0.0.1] 
+usery@test.fail.dns cannot be resolved at this time:
+  host lookup for test.fail.dns did not complete (DNS timeout?)
+userz@test.fail.dns cannot be resolved at this time:
+  host lookup for test.fail.dns did not complete (DNS timeout?)
+xyz@ten-1.test.ex
+  router = lookuphost, transport = smtp
+  host ten-1.test.ex [V4NET.0.0.1] 
+userx@nonexist.test.ex is undeliverable:
+  Unrouteable address
+abcd@nonexist.test.ex is undeliverable:
+  Unrouteable address
+abcd@ten-1.test.ex
+  router = lookuphost, transport = smtp
+  host ten-1.test.ex [V4NET.0.0.1] 
+usery@nonexist.test.ex cannot be resolved at this time:
+  lookup of host "nonexist.test.ex" failed in useryz router
+userz@nonexist.test.ex cannot be resolved at this time:
+  lookup of host "nonexist.test.ex" failed in useryz router
+xyz@ten-1.test.ex
+  router = lookuphost, transport = smtp
+  host ten-1.test.ex [V4NET.0.0.1] 
+srv@test.again.dns cannot be resolved at this time:
+  host lookup did not complete
+srv@test.fail.dns cannot be resolved at this time:
+  host lookup did not complete
diff --git a/test/stdout/0184 b/test/stdout/0184
new file mode 100644
index 000000000..7c70e0960
--- /dev/null
+++ b/test/stdout/0184
@@ -0,0 +1,202 @@
+To: contains
+000@test.ex, 001@test.ex, 002@test.ex, 003@test.ex, 004@test.ex,
+    005@test.ex, 006@test.ex, 007@test.ex, 008@test.ex, 009@test.ex,
+    010@test.ex, 011@test.ex, 012@test.ex, 013@test.ex, 014@test.ex,
+    015@test.ex, 016@test.ex, 017@test.ex, 018@test.ex, 019@test.ex,
+    020@test.ex, 021@test.ex, 022@test.ex, 023@test.ex, 024@test.ex,
+    025@test.ex, 026@test.ex, 027@test.ex, 028@test.ex, 029@test.ex,
+    030@test.ex, 031@test.ex, 032@test.ex, 033@test.ex, 034@test.ex,
+    035@test.ex, 036@test.ex, 037@test.ex, 038@test.ex, 039@test.ex,
+    040@test.ex, 041@test.ex, 042@test.ex, 043@test.ex, 044@test.ex,
+    045@test.ex, 046@test.ex, 047@test.ex, 048@test.ex, 049@test.ex,
+    050@test.ex, 051@test.ex, 052@test.ex, 053@test.ex, 054@test.ex,
+    055@test.ex, 056@test.ex, 057@test.ex, 058@test.ex, 059@test.ex,
+    060@test.ex, 061@test.ex, 062@test.ex, 063@test.ex, 064@test.ex,
+    065@test.ex, 066@test.ex, 067@test.ex, 068@test.ex, 069@test.ex,
+    070@test.ex, 071@test.ex, 072@test.ex, 073@test.ex, 074@test.ex,
+    075@test.ex, 076@test.ex, 077@test.ex, 078@test.ex, 079@test.ex,
+    080@test.ex, 081@test.ex, 082@test.ex, 083@test.ex, 084@test.ex,
+    085@test.ex, 086@test.ex, 087@test.ex, 088@test.ex, 089@test.ex,
+    090@test.ex, 091@test.ex, 092@test.ex, 093@test.ex, 094@test.ex,
+    095@test.ex, 096@test.ex, 097@test.ex, 098@test.ex, 099@test.ex,
+    100@test.ex, 101@test.ex, 102@test.ex, 103@test.ex, 104@test.ex,
+    105@test.ex, 106@test.ex, 107@test.ex, 108@test.ex, 109@test.ex,
+    110@test.ex, 111@test.ex, 112@test.ex, 113@test.ex, 114@test.ex,
+    115@test.ex, 116@test.ex, 117@test.ex, 118@test.ex, 119@test.ex,
+    120@test.ex, 121@test.ex, 122@test.ex, 123@test.ex, 124@test.ex,
+    125@test.ex, 126@test.ex, 127@test.ex, 128@test.ex, 129@test.ex,
+    130@test.ex, 131@test.ex, 132@test.ex, 133@test.ex, 134@test.ex,
+    135@test.ex, 136@test.ex, 137@test.ex, 138@test.ex, 139@test.ex,
+    140@test.ex, 141@test.ex, 142@test.ex, 143@test.ex, 144@test.ex,
+    145@test.ex, 146@test.ex, 147@test.ex, 148@test.ex, 149@test.ex,
+    150@test.ex, 151@test.ex, 152@test.ex, 153@test.ex, 154@test.ex,
+    155@test.ex, 156@test.ex, 157@test.ex, 158@test.ex, 159@test.ex,
+    160@test.ex, 161@test.ex, 162@test.ex, 163@test.ex, 164@test.ex,
+    165@test.ex, 166@test.ex, 167@test.ex, 168@test.ex, 169@test.ex,
+    170@test.ex, 171@test.ex, 172@test.ex, 173@test.ex, 174@test.ex,
+    175@test.ex, 176@test.ex, 177@test.ex, 178@test.ex, 179@test.ex,
+    180@test.ex, 181@test.ex, 182@test.ex, 183@test.ex, 184@test.ex,
+    185@test.ex, 186@test.ex, 187@test.ex, 188@test.ex, 189@test.ex,
+    190@test.ex, 191@test.ex, 192@test.ex, 193@test.ex, 194@test.ex,
+    195@test.ex, 196@test.ex, 197@test.ex, 198@test.ex, 199@test.ex,
+    200@test.ex, 201@test.ex, 202@test.ex, 203@test.ex, 204@test.ex,
+    205@test.ex, 206@test.ex, 207@test.ex, 208@test.ex, 209@test.ex,
+    210@test.ex, 211@test.ex, 212@test.ex, 213@test.ex, 214@test.ex,
+    215@test.ex, 216@test.ex, 217@test.ex, 218@test.ex, 219@test.ex,
+    220@test.ex, 221@test.ex, 222@test.ex, 223@test.ex, 224@test.ex,
+    225@test.ex, 226@test.ex, 227@test.ex, 228@test.ex, 229@test.ex,
+    230@test.ex, 231@test.ex, 232@test.ex, 233@test.ex, 234@test.ex,
+    235@test.ex, 236@test.ex, 237@test.ex, 238@test.ex, 239@test.ex,
+    240@test.ex, 241@test.ex, 242@test.ex, 243@test.ex, 244@test.ex,
+    245@test.ex, 246@test.ex, 247@test.ex, 248@test.ex, 249@test.ex,
+    250@test.ex, 251@test.ex, 252@test.ex, 253@test.ex, 254@test.ex,
+    255@test.ex, 256@test.ex, 257@test.ex, 258@test.ex, 259@test.ex,
+    260@test.ex, 261@test.ex, 262@test.ex, 263@test.ex, 264@test.ex,
+    265@test.ex, 266@test.ex, 267@test.ex, 268@test.ex, 269@test.ex,
+    270@test.ex, 271@test.ex, 272@test.ex, 273@test.ex, 274@test.ex,
+    275@test.ex, 276@test.ex, 277@test.ex, 278@test.ex, 279@test.ex,
+    280@test.ex, 281@test.ex, 282@test.ex, 283@test.ex, 284@test.ex,
+    285@test.ex, 286@test.ex, 287@test.ex, 288@test.ex, 289@test.ex,
+    290@test.ex, 291@test.ex, 292@test.ex, 293@test.ex, 294@test.ex,
+    295@test.ex, 296@test.ex, 297@test.ex, 298@test.ex, 299@test.ex,
+    300@test.ex, 301@test.ex, 302@test.ex, 303@test.ex, 304@test.ex,
+    305@test.ex, 306@test.ex, 307@test.ex, 308@test.ex, 309@test.ex,
+    310@test.ex, 311@test.ex, 312@test.ex, 313@test.ex, 314@test.ex,
+    315@test.ex, 316@test.ex, 317@test.ex, 318@test.ex, 319@test.ex,
+    320@test.ex, 321@test.ex, 322@test.ex, 323@test.ex, 324@test.ex,
+    325@test.ex, 326@test.ex, 327@test.ex, 328@test.ex, 329@test.ex,
+    330@test.ex, 331@test.ex, 332@test.ex, 333@test.ex, 334@test.ex,
+    335@test.ex, 336@test.ex, 337@test.ex, 338@test.ex, 339@test.ex,
+    340@test.ex, 341@test.ex, 342@test.ex, 343@test.ex, 344@test.ex,
+    345@test.ex, 346@test.ex, 347@test.ex, 348@test.ex, 349@test.ex,
+    350@test.ex, 351@test.ex, 352@test.ex, 353@test.ex, 354@test.ex,
+    355@test.ex, 356@test.ex, 357@test.ex, 358@test.ex, 359@test.ex,
+    360@test.ex, 361@test.ex, 362@test.ex, 363@test.ex, 364@test.ex,
+    365@test.ex, 366@test.ex, 367@test.ex, 368@test.ex, 369@test.ex,
+    370@test.ex, 371@test.ex, 372@test.ex, 373@test.ex, 374@test.ex,
+    375@test.ex, 376@test.ex, 377@test.ex, 378@test.ex, 379@test.ex,
+    380@test.ex, 381@test.ex, 382@test.ex, 383@test.ex, 384@test.ex,
+    385@test.ex, 386@test.ex, 387@test.ex, 388@test.ex, 389@test.ex,
+    390@test.ex, 391@test.ex, 392@test.ex, 393@test.ex, 394@test.ex,
+    395@test.ex, 396@test.ex, 397@test.ex, 398@test.ex, 399@test.ex,
+    400@test.ex, 401@test.ex, 402@test.ex, 403@test.ex, 404@test.ex,
+    405@test.ex, 406@test.ex, 407@test.ex, 408@test.ex, 409@test.ex,
+    410@test.ex, 411@test.ex, 412@test.ex, 413@test.ex, 414@test.ex,
+    415@test.ex, 416@test.ex, 417@test.ex, 418@test.ex, 419@test.ex,
+    420@test.ex, 421@test.ex, 422@test.ex, 423@test.ex, 424@test.ex,
+    425@test.ex, 426@test.ex, 427@test.ex, 428@test.ex, 429@test.ex,
+    430@test.ex, 431@test.ex, 432@test.ex, 433@test.ex, 434@test.ex,
+    435@test.ex, 436@test.ex, 437@test.ex, 438@test.ex, 439@test.ex,
+    440@test.ex, 441@test.ex, 442@test.ex, 443@test.ex, 444@test.ex,
+    445@test.ex, 446@test.ex, 447@test.ex, 448@test.ex, 449@test.ex,
+    450@test.ex, 451@test.ex, 452@test.ex, 453@test.ex, 454@test.ex,
+    455@test.ex, 456@test.ex, 457@test.ex, 458@test.ex, 459@test.ex,
+    460@test.ex, 461@test.ex, 462@test.ex, 463@test.ex, 464@test.ex,
+    465@test.ex, 466@test.ex, 467@test.ex, 468@test.ex, 469@test.ex,
+    470@test.ex, 471@test.ex, 472@test.ex, 473@test.ex, 474@test.ex,
+    475@test.ex, 476@test.ex, 477@test.ex, 478@test.ex, 479@test.ex,
+    480@test.ex, 481@test.ex, 482@test.ex, 483@test.ex, 484@test.ex,
+    485@test.ex, 486@test.ex, 487@test.ex, 488@test.ex, 489@test.ex,
+    490@test.ex, 491@test.ex, 492@test.ex, 493@test.ex, 494@test.ex,
+    495@test.ex, 496@test.ex, 497@test.ex, 498@test.ex, 499@test.ex,
+    500@test.ex, 501@test.ex, 502@test.ex, 503@test.ex, 504@test.ex,
+    505@test.ex, 506@test.ex, 507@test.ex, 508@test.ex, 509@test.ex,
+    510@test.ex, 511@test.ex, 512@test.ex, 513@test.ex, 514@test.ex,
+    515@test.ex, 516@test.ex, 517@test.ex, 518@test.ex, 519@test.ex,
+    520@test.ex, 521@test.ex, 522@test.ex, 523@test.ex, 524@test.ex,
+    525@test.ex, 526@test.ex, 527@test.ex, 528@test.ex, 529@test.ex,
+    530@test.ex, 531@test.ex, 532@test.ex, 533@test.ex, 534@test.ex,
+    535@test.ex, 536@test.ex, 537@test.ex, 538@test.ex, 539@test.ex,
+    540@test.ex, 541@test.ex, 542@test.ex, 543@test.ex, 544@test.ex,
+    545@test.ex, 546@test.ex, 547@test.ex, 548@test.ex, 549@test.ex,
+    550@test.ex, 551@test.ex, 552@test.ex, 553@test.ex, 554@test.ex,
+    555@test.ex, 556@test.ex, 557@test.ex, 558@test.ex, 559@test.ex,
+    560@test.ex, 561@test.ex, 562@test.ex, 563@test.ex, 564@test.ex,
+    565@test.ex, 566@test.ex, 567@test.ex, 568@test.ex, 569@test.ex,
+    570@test.ex, 571@test.ex, 572@test.ex, 573@test.ex, 574@test.ex,
+    575@test.ex, 576@test.ex, 577@test.ex, 578@test.ex, 579@test.ex,
+    580@test.ex, 581@test.ex, 582@test.ex, 583@test.ex, 584@test.ex,
+    585@test.ex, 586@test.ex, 587@test.ex, 588@test.ex, 589@test.ex,
+    590@test.ex, 591@test.ex, 592@test.ex, 593@test.ex, 594@test.ex,
+    595@test.ex, 596@test.ex, 597@test.ex, 598@test.ex, 599@test.ex,
+    600@test.ex, 601@test.ex, 602@test.ex, 603@test.ex, 604@test.ex,
+    605@test.ex, 606@test.ex, 607@test.ex, 608@test.ex, 609@test.ex,
+    610@test.ex, 611@test.ex, 612@test.ex, 613@test.ex, 614@test.ex,
+    615@test.ex, 616@test.ex, 617@test.ex, 618@test.ex, 619@test.ex,
+    620@test.ex, 621@test.ex, 622@test.ex, 623@test.ex, 624@test.ex,
+    625@test.ex, 626@test.ex, 627@test.ex, 628@test.ex, 629@test.ex,
+    630@test.ex, 631@test.ex, 632@test.ex, 633@test.ex, 634@test.ex,
+    635@test.ex, 636@test.ex, 637@test.ex, 638@test.ex, 639@test.ex,
+    640@test.ex, 641@test.ex, 642@test.ex, 643@test.ex, 644@test.ex,
+    645@test.ex, 646@test.ex, 647@test.ex, 648@test.ex, 649@test.ex,
+    650@test.ex, 651@test.ex, 652@test.ex, 653@test.ex, 654@test.ex,
+    655@test.ex, 656@test.ex, 657@test.ex, 658@test.ex, 659@test.ex,
+    660@test.ex, 661@test.ex, 662@test.ex, 663@test.ex, 664@test.ex,
+    665@test.ex, 666@test.ex, 667@test.ex, 668@test.ex, 669@test.ex,
+    670@test.ex, 671@test.ex, 672@test.ex, 673@test.ex, 674@test.ex,
+    675@test.ex, 676@test.ex, 677@test.ex, 678@test.ex, 679@test.ex,
+    680@test.ex, 681@test.ex, 682@test.ex, 683@test.ex, 684@test.ex,
+    685@test.ex, 686@test.ex, 687@test.ex, 688@test.ex, 689@test.ex,
+    690@test.ex, 691@test.ex, 692@test.ex, 693@test.ex, 694@test.ex,
+    695@test.ex, 696@test.ex, 697@test.ex, 698@test.ex, 699@test.ex,
+    700@test.ex, 701@test.ex, 702@test.ex, 703@test.ex, 704@test.ex,
+    705@test.ex, 706@test.ex, 707@test.ex, 708@test.ex, 709@test.ex,
+    710@test.ex, 711@test.ex, 712@test.ex, 713@test.ex, 714@test.ex,
+    715@test.ex, 716@test.ex, 717@test.ex, 718@test.ex, 719@test.ex,
+    720@test.ex, 721@test.ex, 722@test.ex, 723@test.ex, 724@test.ex,
+    725@test.ex, 726@test.ex, 727@test.ex, 728@test.ex, 729@test.ex,
+    730@test.ex, 731@test.ex, 732@test.ex, 733@test.ex, 734@test.ex,
+    735@test.ex, 736@test.ex, 737@test.ex, 738@test.ex, 739@test.ex,
+    740@test.ex, 741@test.ex, 742@test.ex, 743@test.ex, 744@test.ex,
+    745@test.ex, 746@test.ex, 747@test.ex, 748@test.ex, 749@test.ex,
+    750@test.ex, 751@test.ex, 752@test.ex, 753@test.ex, 754@test.ex,
+    755@test.ex, 756@test.ex, 757@test.ex, 758@test.ex, 759@test.ex,
+    760@test.ex, 761@test.ex, 762@test.ex, 763@test.ex, 764@test.ex,
+    765@test.ex, 766@test.ex, 767@test.ex, 768@test.ex, 769@test.ex,
+    770@test.ex, 771@test.ex, 772@test.ex, 773@test.ex, 774@test.ex,
+    775@test.ex, 776@test.ex, 777@test.ex, 778@test.ex, 779@test.ex,
+    780@test.ex, 781@test.ex, 782@test.ex, 783@test.ex, 784@test.ex,
+    785@test.ex, 786@test.ex, 787@test.ex, 788@test.ex, 789@test.ex,
+    790@test.ex, 791@test.ex, 792@test.ex, 793@test.ex, 794@test.ex,
+    795@test.ex, 796@test.ex, 797@test.ex, 798@test.ex, 799@test.ex,
+    800@test.ex, 801@test.ex, 802@test.ex, 803@test.ex, 804@test.ex,
+    805@test.ex, 806@test.ex, 807@test.ex, 808@test.ex, 809@test.ex,
+    810@test.ex, 811@test.ex, 812@test.ex, 813@test.ex, 814@test.ex,
+    815@test.ex, 816@test.ex, 817@test.ex, 818@test.ex, 819@test.ex,
+    820@test.ex, 821@test.ex, 822@test.ex, 823@test.ex, 824@test.ex,
+    825@test.ex, 826@test.ex, 827@test.ex, 828@test.ex, 829@test.ex,
+    830@test.ex, 831@test.ex, 832@test.ex, 833@test.ex, 834@test.ex,
+    835@test.ex, 836@test.ex, 837@test.ex, 838@test.ex, 839@test.ex,
+    840@test.ex, 841@test.ex, 842@test.ex, 843@test.ex, 844@test.ex,
+    845@test.ex, 846@test.ex, 847@test.ex, 848@test.ex, 849@test.ex,
+    850@test.ex, 851@test.ex, 852@test.ex, 853@test.ex, 854@test.ex,
+    855@test.ex, 856@test.ex, 857@test.ex, 858@test.ex, 859@test.ex,
+    860@test.ex, 861@test.ex, 862@test.ex, 863@test.ex, 864@test.ex,
+    865@test.ex, 866@test.ex, 867@test.ex, 868@test.ex, 869@test.ex,
+    870@test.ex, 871@test.ex, 872@test.ex, 873@test.ex, 874@test.ex,
+    875@test.ex, 876@test.ex, 877@test.ex, 878@test.ex, 879@test.ex,
+    880@test.ex, 881@test.ex, 882@test.ex, 883@test.ex, 884@test.ex,
+    885@test.ex, 886@test.ex, 887@test.ex, 888@test.ex, 889@test.ex,
+    890@test.ex, 891@test.ex, 892@test.ex, 893@test.ex, 894@test.ex,
+    895@test.ex, 896@test.ex, 897@test.ex, 898@test.ex, 899@test.ex,
+    900@test.ex, 901@test.ex, 902@test.ex, 903@test.ex, 904@test.ex,
+    905@test.ex, 906@test.ex, 907@test.ex, 908@test.ex, 909@test.ex,
+    910@test.ex, 911@test.ex, 912@test.ex, 913@test.ex, 914@test.ex,
+    915@test.ex, 916@test.ex, 917@test.ex, 918@test.ex, 919@test.ex,
+    920@test.ex, 921@test.ex, 922@test.ex, 923@test.ex, 924@test.ex,
+    925@test.ex, 926@test.ex, 927@test.ex, 928@test.ex, 929@test.ex,
+    930@test.ex, 931@test.ex, 932@test.ex, 933@test.ex, 934@test.ex,
+    935@test.ex, 936@test.ex, 937@test.ex, 938@test.ex, 939@test.ex,
+    940@test.ex, 941@test.ex, 942@test.ex, 943@test.ex, 944@test.ex,
+    945@test.ex, 946@test.ex, 947@test.ex, 948@test.ex, 949@test.ex,
+    950@test.ex, 951@test.ex, 952@test.ex, 953@test.ex, 954@test.ex,
+    955@test.ex, 956@test.ex, 957@test.ex, 958@test.ex, 959@test.ex,
+    960@test.ex, 961@test.ex, 962@test.ex, 963@test.ex, 964@test.ex,
+    965@test.ex, 966@test.ex, 967@test.ex, 968@test.ex, 969@test.ex,
+    970@test.ex, 971@test.ex, 972@test.ex, 973@test.ex, 974@test.ex,
+    975@test.ex, 976@test.ex, 977@test.ex, 978@test.ex, 979@test.ex,
+    980@test.ex, 981@test.ex, 982@test.ex, 983@test.ex, 984@test.ex,
+    985@test.ex, 986@test.ex, 987@test.ex, 988@test.ex, 989@test.ex,
+    990@test.ex, 991@test.ex, 992@test.ex, 993@test.ex, 994@test.ex,
+    995@test.ex, 996@test.ex, 997@test.ex, 998@test.ex, 999@test.ex
+nnnnnn
diff --git a/test/stdout/0185 b/test/stdout/0185
new file mode 100644
index 000000000..dba278f72
--- /dev/null
+++ b/test/stdout/0185
@@ -0,0 +1,32 @@
+ 0m   sss 10HmaX-0005vi-00 <CALLER@test.ex> *** frozen ***
+          usery@test.ex
+
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@non.local.domain>
+250 Recipient OK
+DATA
+350 Send message
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00
+	for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Subject: freeze this
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a message to be frozen.
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0186 b/test/stdout/0186
new file mode 100644
index 000000000..3653da9b7
--- /dev/null
+++ b/test/stdout/0186
@@ -0,0 +1,6 @@
+userx@other2.test.ex
+  router = lookuphost, transport = smtp
+  host other2.test.ex [V4NET.12.3.1] 
+userx@ten-5-6.test.ex
+  router = domainlist, transport = smtp
+  host ten-5-6.test.ex [V4NET.0.0.5] 
diff --git a/test/stdout/0187 b/test/stdout/0187
new file mode 100644
index 000000000..496d09c72
--- /dev/null
+++ b/test/stdout/0187
@@ -0,0 +1,23 @@
+userx@other2.test.ex
+  router = lookuphost2, transport = smtp
+  host other2.test.ex [V4NET.12.3.1] 
+userx@ten-5-6.test.ex
+  router = domainlist, transport = smtp
+  host ten-5-6.test.ex [V4NET.0.0.5] 
+userx@mxt7.test.ex
+  router = lookuphost, transport = smtp
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+userx@mxt9.test.ex
+  router = lookuphost, transport = smtp
+  host ten-3.test.ex [V4NET.0.0.3] MX=7
+userx@eximtesthost.test.ex
+  router = lookuphost2, transport = smtp
+  host eximtesthost.test.ex [ip4.ip4.ip4.ip4] 
+userx@localhost is undeliverable:
+  Unrouteable address
+userx@mxt10.test.ex is undeliverable:
+  all relevant MX records point to non-existent hosts
+userx@mxt11.test.ex is undeliverable:
+  all relevant MX records point to non-existent hosts
+userx@mxt12.test.ex is undeliverable:
+  all relevant MX records point to non-existent hosts
diff --git a/test/stdout/0188 b/test/stdout/0188
new file mode 100644
index 000000000..009fd3d76
--- /dev/null
+++ b/test/stdout/0188
@@ -0,0 +1,3 @@
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+221 the.local.host.name closing connection
diff --git a/test/stdout/0190 b/test/stdout/0190
new file mode 100644
index 000000000..66bd28c1c
--- /dev/null
+++ b/test/stdout/0190
@@ -0,0 +1,269 @@
+x@x
+  router = others, transport = smtp2
+  host V4NET.0.0.3 [V4NET.0.0.3] 
+  host V4NET.0.0.2 [V4NET.0.0.2] 
+  host V4NET.0.0.1 [V4NET.0.0.1] 
+x@y
+  router = others, transport = smtp2
+  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.2 [V4NET.0.0.2] 
+  host V4NET.0.0.3 [V4NET.0.0.3] 
+x@z
+  router = others, transport = smtp2
+  host V4NET.0.0.3 [V4NET.0.0.3] 
+  host V4NET.0.0.2 [V4NET.0.0.2] 
+  host V4NET.0.0.1 [V4NET.0.0.1] 
+x@batch
+  router = batched, transport = smtp2
+  host V4NET.0.0.3 [V4NET.0.0.3] 
+  host V4NET.0.0.2 [V4NET.0.0.2] 
+  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.4 [V4NET.0.0.4] 
+  host V4NET.0.0.5 [V4NET.0.0.5] 
+  host V4NET.0.0.6 [V4NET.0.0.6] 
+  host V4NET.0.0.7 [V4NET.0.0.7] 
+y@batch
+  router = batched, transport = smtp2
+  host V4NET.0.0.2 [V4NET.0.0.2] 
+  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.3 [V4NET.0.0.3] 
+  host V4NET.0.0.6 [V4NET.0.0.6] 
+  host V4NET.0.0.4 [V4NET.0.0.4] 
+  host V4NET.0.0.5 [V4NET.0.0.5] 
+  host V4NET.0.0.7 [V4NET.0.0.7] 
+z@batch
+  router = batched, transport = smtp2
+  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.3 [V4NET.0.0.3] 
+  host V4NET.0.0.2 [V4NET.0.0.2] 
+  host V4NET.0.0.5 [V4NET.0.0.5] 
+  host V4NET.0.0.4 [V4NET.0.0.4] 
+  host V4NET.0.0.6 [V4NET.0.0.6] 
+  host V4NET.0.0.7 [V4NET.0.0.7] 
+x@batch2
+  router = batched, transport = smtp2
+  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.2 [V4NET.0.0.2] 
+  host V4NET.0.0.3 [V4NET.0.0.3] 
+  host V4NET.0.0.4 [V4NET.0.0.4] 
+  host V4NET.0.0.5 [V4NET.0.0.5] 
+  host V4NET.0.0.6 [V4NET.0.0.6] 
+  host V4NET.0.0.7 [V4NET.0.0.7] 
+y@batch2
+  router = batched, transport = smtp2
+  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.2 [V4NET.0.0.2] 
+  host V4NET.0.0.3 [V4NET.0.0.3] 
+  host V4NET.0.0.4 [V4NET.0.0.4] 
+  host V4NET.0.0.5 [V4NET.0.0.5] 
+  host V4NET.0.0.6 [V4NET.0.0.6] 
+  host V4NET.0.0.7 [V4NET.0.0.7] 
+x@batch3
+  router = batched2, transport = smtp2
+  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.2 [V4NET.0.0.2] 
+  host V4NET.0.0.3 [V4NET.0.0.3] 
+  host V4NET.0.0.4 [V4NET.0.0.4] 
+  host V4NET.0.0.5 [V4NET.0.0.5] 
+  host V4NET.0.0.6 [V4NET.0.0.6] 
+  host V4NET.0.0.7 [V4NET.0.0.7] 
+y@batch3
+  router = batched2, transport = smtp2
+  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.2 [V4NET.0.0.2] 
+  host V4NET.0.0.3 [V4NET.0.0.3] 
+  host V4NET.0.0.4 [V4NET.0.0.4] 
+  host V4NET.0.0.5 [V4NET.0.0.5] 
+  host V4NET.0.0.6 [V4NET.0.0.6] 
+  host V4NET.0.0.7 [V4NET.0.0.7] 
+x@batch4
+  router = batched2, transport = smtp2
+  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.2 [V4NET.0.0.2] 
+  host V4NET.0.0.3 [V4NET.0.0.3] 
+  host V4NET.0.0.5 [V4NET.0.0.5] 
+  host V4NET.0.0.4 [V4NET.0.0.4] 
+  host V4NET.0.0.6 [V4NET.0.0.6] 
+  host V4NET.0.0.7 [V4NET.0.0.7] 
+y@batch4
+  router = batched2, transport = smtp2
+  host V4NET.0.0.2 [V4NET.0.0.2] 
+  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.3 [V4NET.0.0.3] 
+  host V4NET.0.0.5 [V4NET.0.0.5] 
+  host V4NET.0.0.6 [V4NET.0.0.6] 
+  host V4NET.0.0.4 [V4NET.0.0.4] 
+  host V4NET.0.0.7 [V4NET.0.0.7] 
+userx@bdomain1
+  router = r3, transport = smtp2
+  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] 
+  host 127.0.0.1 [127.0.0.1]      
+  host the.local.host.name [ip4.ip4.ip4.ip4] 
+userx@bdomain2
+  router = r3, transport = smtp2
+  host the.local.host.name [ip4.ip4.ip4.ip4] 
+  host 127.0.0.1 [127.0.0.1]      
+  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] 
+userx@bdomain3
+  router = r3, transport = smtp2
+  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] 
+  host 127.0.0.1 [127.0.0.1]      
+  host the.local.host.name [ip4.ip4.ip4.ip4] 
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [ip4.ip4.ip4.ip4]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@domain1>
+250 Recipient OK
+DATA
+350 Send message
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message
+.
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [ip4.ip4.ip4.ip4]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@domain2>
+250 Recipient OK
+DATA
+350 Send message
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message
+.
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@domain3>
+250 Recipient OK
+DATA
+350 Send message
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@adomain1>
+250 Recipient OK
+RCPT TO:<userx@adomain2>
+250 Recipient OK
+DATA
+350 Send message
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message
+.
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@adomain3>
+250 Recipient OK
+DATA
+350 Send message
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [ip4.ip4.ip4.ip4]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@bdomain1>
+250 Recipient OK
+RCPT TO:<userx@bdomain2>
+250 Recipient OK
+RCPT TO:<userx@bdomain3>
+250 Recipient OK
+DATA
+350 Send message
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0191 b/test/stdout/0191
new file mode 100644
index 000000000..59474cfad
--- /dev/null
+++ b/test/stdout/0191
@@ -0,0 +1,20 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@domain1>
+250 Recipient OK
+DATA
+354 Send message
+Line without end
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0195 b/test/stdout/0195
new file mode 100644
index 000000000..991c273f3
--- /dev/null
+++ b/test/stdout/0195
@@ -0,0 +1,33 @@
++++++++++++++++++++++++++++
+  R:userx@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
+  R:userz@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
+  R:usery@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
++++++++++++++++++++++++++++
+  R:userx@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
+  R:userz@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
+  R:usery@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
++++++++++++++++++++++++++++
+  R:userx@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
+  R:userz@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
+  R:usery@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
++++++++++++++++++++++++++++
+  R:userx@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
+  R:userz@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
++++++++++++++++++++++++++++
+  R:userx@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
+  R:userz@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
+  R:usery@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
diff --git a/test/stdout/0196 b/test/stdout/0196
new file mode 100644
index 000000000..d5c820e4a
--- /dev/null
+++ b/test/stdout/0196
@@ -0,0 +1,17 @@
+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
+>>> expn postmaster
+??? 250-
+<<< 250-<a@myhost.test.ex>
+??? 250-
+<<< 250-<b@myhost.test.ex>
+??? 250
+<<< 250 <c@myhost.test.ex>
+>>> expn rhubarb
+??? 553
+<<< 553 custard@myhost.test.ex is undeliverable
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/0197 b/test/stdout/0197
new file mode 100644
index 000000000..72f08851e
--- /dev/null
+++ b/test/stdout/0197
@@ -0,0 +1,8 @@
+220 the.local.host.name 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
+250 OK id=10HmaY-0005vi-00
+221 the.local.host.name closing connection
diff --git a/test/stdout/0199 b/test/stdout/0199
new file mode 100644
index 000000000..bacca97ca
--- /dev/null
+++ b/test/stdout/0199
@@ -0,0 +1,8 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-<a@myhost.test.ex>
+250-<b@myhost.test.ex>
+250 <c@myhost.test.ex>
+553 somewhere@else.where is undeliverable
+553 xxxx@exim.org is undeliverable
+553 xxxx@test.ex is undeliverable
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0200 b/test/stdout/0200
new file mode 100644
index 000000000..2d65891bd
--- /dev/null
+++ b/test/stdout/0200
@@ -0,0 +1,4 @@
+xx@host.test.ex is undeliverable:
+  mail domain "host.test.ex._bad" is syntactically invalid
+yy@host.test.ex cannot be resolved at this time:
+  lookup of host "bad_host.test.ex" failed in domainlist router: syntax error in name
diff --git a/test/stdout/0201 b/test/stdout/0201
new file mode 100644
index 000000000..306c2496b
--- /dev/null
+++ b/test/stdout/0201
@@ -0,0 +1,15 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<userx@myhost.test.ex>
+250 OK
+DATA
+351 Send more
+Unexpected EOF read from client
diff --git a/test/stdout/0202 b/test/stdout/0202
new file mode 100644
index 000000000..2b1941f58
--- /dev/null
+++ b/test/stdout/0202
@@ -0,0 +1,12 @@
+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
+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=10HmaY-0005vi-00
+221 the.local.host.name closing connection
diff --git a/test/stdout/0203 b/test/stdout/0203
new file mode 100644
index 000000000..b311e114c
--- /dev/null
+++ b/test/stdout/0203
@@ -0,0 +1,30 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@domain1>
+250 OK
+DATA
+354 More...
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message 1
+.
+250 OK
+MAIL FROM:<CALLER@test.ex>
+550 Don't like that sender
+QUIT
+220 OK
+End of script
diff --git a/test/stdout/0205 b/test/stdout/0205
new file mode 100644
index 000000000..898a92486
--- /dev/null
+++ b/test/stdout/0205
@@ -0,0 +1,10 @@
+> x%y@testhack.test.ex is undeliverable:
+  unrouteable mail domain "y"
+> x%y@test.ex
+  router = local_domains, transport = local_delivery
+> x%y%testhack2.test.ex@testhack.test.ex is undeliverable:
+  unrouteable mail domain "y"
+> X@test.ex
+    <-- X%test.ex@testhack.test.ex
+  router = local_domains, transport = local_delivery
+> 
diff --git a/test/stdout/0206 b/test/stdout/0206
new file mode 100644
index 000000000..5a1059de1
--- /dev/null
+++ b/test/stdout/0206
@@ -0,0 +1 @@
+Message 10HmaX-0005vi-00 is now frozen
diff --git a/test/stdout/0207 b/test/stdout/0207
new file mode 100644
index 000000000..5a1059de1
--- /dev/null
+++ b/test/stdout/0207
@@ -0,0 +1 @@
+Message 10HmaX-0005vi-00 is now frozen
diff --git a/test/stdout/0208 b/test/stdout/0208
new file mode 100644
index 000000000..94301c019
--- /dev/null
+++ b/test/stdout/0208
@@ -0,0 +1,26 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<fail.transport@test.ex>
+550 Recipient refused
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<fail.transport@test.ex>
+550 Recipient refused
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0209 b/test/stdout/0209
new file mode 100644
index 000000000..cdb29fe7d
--- /dev/null
+++ b/test/stdout/0209
@@ -0,0 +1,66 @@
+Message 10HmaX-0005vi-00 has been removed
+Message 10HmaY-0005vi-00 has been removed
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userz@domain1>
+450 Temporary error
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@domain1>
+450 Temporary error
+RCPT TO:<usery@domain1>
+250 OK
+DATA
+354 Go ahead
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message 1
+.
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@domain1>
+450 Temporary error
+RCPT TO:<usery@domain1>
+250 OK
+DATA
+354 Go ahead
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message 2
+.
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@domain1>
+450 Temporary error
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0210 b/test/stdout/0210
new file mode 100644
index 000000000..2eedebd91
--- /dev/null
+++ b/test/stdout/0210
@@ -0,0 +1,26 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<>
+250 Sender OK
+RCPT TO:<smtp@test.ex>
+250 OK
+DATA
+345 Send it
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a test message.
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0211 b/test/stdout/0211
new file mode 100644
index 000000000..446203b4f
--- /dev/null
+++ b/test/stdout/0211
@@ -0,0 +1,34 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+450 I'm busy
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Connected OK
+EHLO the.local.host.name
+450 I'm busy
+HELO the.local.host.name
+450 I'm busy
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+550 Go away
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Connected OK
+EHLO the.local.host.name
+550 Go away
+HELO the.local.host.name
+550 Go away
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0212 b/test/stdout/0212
new file mode 100644
index 000000000..382af7bbe
--- /dev/null
+++ b/test/stdout/0212
@@ -0,0 +1,42 @@
+> a@test.ex verified
+> b@test.ex failed to verify:
+  Unrouteable address
+> f@test.ex failed to verify:
+  bad user
+> p@test.ex verified
+> x@test.ex failed to verify:
+  Unrouteable address
+> y@test.ex verified
+> pipe@test.ex verified
+> file@test.ex verified
+> "smartuser.a@test.ex"@test.ex verified
+> "smartuser.b@test.ex"@test.ex failed to verify:
+  Unrouteable address
+> "smartuser.b@test.ex,a@test.ex"@test.ex verified
+> 
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550 unrouteable address
+550 unrouteable address
+250 Accepted
+550 unrouteable address
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+550 unrouteable address
+250 Accepted
+250 Reset OK
+250 <a@test.ex> is deliverable
+550 <b@test.ex> Unrouteable address
+550 <f@test.ex> bad user
+250 <p@test.ex> is deliverable
+550 <x@test.ex> Unrouteable address
+250 <y@test.ex> is deliverable
+250 <pipe@test.ex> is deliverable
+250 <file@test.ex> is deliverable
+250 <"smartuser.a@test.ex"@test.ex> is deliverable
+550 <"smartuser.b@test.ex"@test.ex> Unrouteable address
+250 <"smartuser.b@test.ex,a@test.ex"@test.ex> is deliverable
+221 the.local.host.name closing connection
diff --git a/test/stdout/0213 b/test/stdout/0213
new file mode 100644
index 000000000..2d5a7602d
--- /dev/null
+++ b/test/stdout/0213
@@ -0,0 +1,16 @@
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:1224 -19 65 Malformed SMTP reply from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<userx@domain1>: 550 The answer is no, but I am going to make sure it is a very
+first failed = time last try = time2 next try = time2 + 3600
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<userx@domain1>
+550 The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. I said NO!
+Unexpected EOF read from client
diff --git a/test/stdout/0214 b/test/stdout/0214
new file mode 100644
index 000000000..dda5d614d
--- /dev/null
+++ b/test/stdout/0214
@@ -0,0 +1,44 @@
+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
+>>> mail from:<x@y.x>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> From: Me <x@y.z>
+>>> Comment: This was really seen!
+>>> To: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
+>>>     END
+>>> .
+??? 550
+<<< 550 Administrative prohibition
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/0215 b/test/stdout/0215
new file mode 100644
index 000000000..a562016e0
--- /dev/null
+++ b/test/stdout/0215
@@ -0,0 +1,219 @@
+Message 10HmaY-0005vi-00 has been removed
+Message 10HmbA-0005vi-00 has been removed
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+LHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userx@myhost.test.ex>
+250 Receiver OK
+DATA
+354 Send it
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a test message.
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+LHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userx@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<userxx@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<userxy@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<userxz@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<useryx@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<useryy@myhost.test.ex>
+250 Receiver OK
+DATA
+354 Send it
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a test message.
+.
+250 OK
+440 Temporary error
+550 Bad user
+250 OK
+440 Temporary error
+550 Bad user
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+LHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userx@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<userxx@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<userxy@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<userxz@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<useryx@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<useryy@myhost.test.ex>
+250 Receiver OK
+DATA
+354 Send it
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a test message.
+.
+250 OK
+440 Temporary error
+550-I don't like this user
+*sleep 1
+550 Bad user
+250-This one's OK
+250 OK
+440-Here's a whole long message, in several lines,
+*sleep 1
+440-just for testing that nothing breaks when
+440-we do this
+440 Temporary error
+550 Bad user
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+LHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userx@myhost.test.ex>
+550 Receiver BAD
+RCPT TO:<userxx@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<userxy@myhost.test.ex>
+450 Receiver temporarily bad
+RCPT TO:<userxz@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<useryx@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<useryy@myhost.test.ex>
+550 Receiver BAD
+DATA
+354 Send it
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a test message.
+.
+440 Temporary error
+550-I don't like this user
+550 Bad user
+250-This one's OK
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+LHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userxx@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<userxy@myhost.test.ex>
+250 Receiver OK
+RCPT TO:<userxz@myhost.test.ex>
+250 Receiver OK
+DATA
+354 Send it
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmbE-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a test message.
+.
+250 OK
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+LHLO myhost.test.ex
+250-OK
+250-IGNOREQUOTA
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userxx@myhost.test.ex> IGNOREQUOTA
+250 Receiver OK
+RCPT TO:<userxy@myhost.test.ex> IGNOREQUOTA
+250 Receiver OK
+RCPT TO:<userxz@myhost.test.ex> IGNOREQUOTA
+250 Receiver OK
+DATA
+354 Send it
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a test message.
+.
+250 OK
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0217 b/test/stdout/0217
new file mode 100644
index 000000000..af856787b
--- /dev/null
+++ b/test/stdout/0217
@@ -0,0 +1,291 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<a@test.ex>
+250 OK
+RCPT TO:<b@test.ex>
+451 Temp error
+RCPT TO:<c@test.ex>
+550 Perm error
+RCPT TO:<d@test.ex>
+250 OK
+DATA
+351 Send more
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<a@test.ex>
+250 OK
+*sleep 2
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+451 Temp error
+RCPT TO:<a@test.ex>
+503 No sender given
+RCPT TO:<b@test.ex>
+503 No sender given
+DATA
+503 No envelope
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+550 Perm error
+RCPT TO:<a@test.ex>
+503 No sender given
+RCPT TO:<b@test.ex>
+503 No sender given
+DATA
+503 No envelope
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<a@test.ex>
+451 Temp error 1
+RCPT TO:<b@test.ex>
+451 Temp error 2
+DATA
+503 No recipients
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<a@test.ex>
+551 Perm error 1
+RCPT TO:<b@test.ex>
+551 Perm error 2
+DATA
+503 No recipients
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<a@test.ex>
+451 Temp error 1
+RCPT TO:<b@test.ex>
+551 Perm error 2
+DATA
+503 No recipients
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<a@test.ex>
+250 OK
+RCPT TO:<b@test.ex>
+250 OK
+DATA
+503 Sorry perm data error
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<a@test.ex>
+250 OK
+RCPT TO:<b@test.ex>
+250 OK
+DATA
+403 Sorry temp data error
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<a@test.ex>
+250 OK
+RCPT TO:<b@test.ex>
+550 NO
+RCPT TO:<c@test.ex>
+550 NO
+RCPT TO:<d@test.ex>
+550 NO
+RCPT TO:<e@test.ex>
+550 NO
+RCPT TO:<f@test.ex>
+550 NO
+RCPT TO:<g@test.ex>
+550 NO
+RCPT TO:<h@test.ex>
+550 NO
+RCPT TO:<i@test.ex>
+550 NO
+RCPT TO:<j@test.ex>
+550 NO
+RCPT TO:<k@test.ex>
+550 NO
+RCPT TO:<l@test.ex>
+550 NO
+RCPT TO:<m@test.ex>
+550 NO
+RCPT TO:<n@test.ex>
+550 NO
+RCPT TO:<o@test.ex>
+550 NO
+RCPT TO:<p@test.ex>
+550 NO
+RCPT TO:<q@test.ex>
+550 NO
+RCPT TO:<r@test.ex>
+550 NO
+RCPT TO:<s@test.ex>
+550 NO
+RCPT TO:<t@test.ex>
+550 NO
+RCPT TO:<u@test.ex>
+550 NO
+RCPT TO:<v@test.ex>
+550 NO
+RCPT TO:<w@test.ex>
+550 NO
+RCPT TO:<x@test.ex>
+550 NO
+RCPT TO:<y@test.ex>
+550 NO
+RCPT TO:<z@test.ex>
+550 NO
+RCPT TO:<aa@test.ex>
+550 NO
+RCPT TO:<bb@test.ex>
+550 NO
+RCPT TO:<cc@test.ex>
+550 NO
+RCPT TO:<dd@test.ex>
+550 NO
+RCPT TO:<ee@test.ex>
+550 NO
+RCPT TO:<ff@test.ex>
+550 NO
+RCPT TO:<gg@test.ex>
+550 NO
+RCPT TO:<hh@test.ex>
+550 NO
+RCPT TO:<ii@test.ex>
+550 NO
+RCPT TO:<jj@test.ex>
+550 NO
+RCPT TO:<kk@test.ex>
+550 NO
+RCPT TO:<ll@test.ex>
+550 NO
+RCPT TO:<mm@test.ex>
+550 NO
+RCPT TO:<nn@test.ex>
+550 NO
+RCPT TO:<oo@test.ex>
+550 NO
+RCPT TO:<pp@test.ex>
+550 NO
+RCPT TO:<qq@test.ex>
+550 NO
+RCPT TO:<rr@test.ex>
+550 NO
+RCPT TO:<ss@test.ex>
+550 NO
+RCPT TO:<tt@test.ex>
+550 NO
+RCPT TO:<uu@test.ex>
+550 NO
+RCPT TO:<vv@test.ex>
+550 NO
+RCPT TO:<ww@test.ex>
+550 NO
+RCPT TO:<xx@test.ex>
+550 NO
+RCPT TO:<yy@test.ex>
+550 NO
+RCPT TO:<zz@test.ex>
+550 NO
+DATA
+403 Sorry temp data error
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<a@test.ex>
+250 OK
+RCPT TO:<b@test.ex>
+550 NO
+End of script
diff --git a/test/stdout/0218 b/test/stdout/0218
new file mode 100644
index 000000000..c7f853fc5
--- /dev/null
+++ b/test/stdout/0218
@@ -0,0 +1,94 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<a@test.ex>
+250 OK
+DATA
+351 Send more
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00
+	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Message 1
+.
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<b@test.ex>
+250 OK
+DATA
+351 Send more
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaY-0005vi-00
+	for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Message 2
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+550 NO
+RCPT TO:<a@test.ex>
+503 Unexpected RCPT
+DATA
+503 Unexpected DATA
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-OK
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<b@test.ex>
+550 Unknown
+DATA
+503 Unexpected DATA
+RSET
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<c@test.ex>
+250 OK
+DATA
+351 OK
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmbC-0005vi-00
+	for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Message 3
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0219 b/test/stdout/0219
new file mode 100644
index 000000000..58fad2ce8
--- /dev/null
+++ b/test/stdout/0219
@@ -0,0 +1,2 @@
+> Failed: failed to open TESTSUITE/test-private for linear search: Permission denied (euid=CALLER_UID egid=CALLER_GID)
+> 
diff --git a/test/stdout/0220 b/test/stdout/0220
new file mode 100644
index 000000000..e437f3ed7
--- /dev/null
+++ b/test/stdout/0220
@@ -0,0 +1,15 @@
+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
+ 0m   sss 10HmbC-0005vi-00 <> (CALLER)
+          userx@myhost.test.ex
+
+ 0m   sss 10HmbD-0005vi-00 <foo@bar> (CALLER)
+          userx@myhost.test.ex
+
+ 0m   sss 10HmbE-0005vi-00 <>
+          userx@myhost.test.ex
+
diff --git a/test/stdout/0221 b/test/stdout/0221
new file mode 100644
index 000000000..4f5339bb9
--- /dev/null
+++ b/test/stdout/0221
@@ -0,0 +1,15 @@
+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
+ 0m   sss 10HmbC-0005vi-00 <> (CALLER)
+          userx@myhost.test.ex
+
+ 0m   sss 10HmbD-0005vi-00 <CALLER@myhost.test.ex>
+          userx@myhost.test.ex
+
+ 0m   sss 10HmbE-0005vi-00 <>
+          userx@myhost.test.ex
+
diff --git a/test/stdout/0227 b/test/stdout/0227
new file mode 100644
index 000000000..3682f296c
--- /dev/null
+++ b/test/stdout/0227
@@ -0,0 +1,252 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Verification failed for <bad@localhost>
+550-Called:   127.0.0.1
+550-Sent:     RCPT TO:<bad@localhost>
+550-Response: 550 Unknown user
+550 Sender verify failed
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+451 Could not complete sender verify callout
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550 Sender verify failed
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Callback setup failed while verifying <uncheckable@localhost1>
+550-Called:   127.0.0.1
+550-Sent:     MAIL FROM:<>
+550-Response: 550-Multiline error for <>
+550-550 Here's the second line
+550-The initial connection, or a HELO or MAIL FROM:<> command was
+550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards
+550-RFC requirements, and stops you from receiving standard bounce
+550-messages. This host does not accept mail from domains whose servers
+550-refuse bounces.
+550 Sender verify failed
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Callout verification failed:
+550 550 Recipient not liked
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Callout verification failed:
+550-550-Recipient not liked on two lines
+550 550 Here's the second
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+451 Could not complete recipient verify callout
+221 myhost.test.ex closing connection
+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
+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
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550 relay not permitted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Postmaster verification failed while checking <ok@localhost1>
+550-Called:   127.0.0.1
+550-Sent:     RCPT TO:<postmaster@localhost1>
+550-Response: 550 Don't like postmaster
+550-Several RFCs state that you are required to have a postmaster
+550-mailbox for each mail domain. This host does not accept mail
+550-from domains whose servers reject the postmaster address.
+550 Sender verify failed
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Callout verification failed:
+550 550 Recipient not liked
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+451 Could not complete sender verify callout
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+451 Could not complete sender verify callout
+221 myhost.test.ex closing connection
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<ok@localhost>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<bad@localhost>
+550 Unknown user
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<uncheckable@localhost1>
+450 Temporary error
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+550 Error for <>
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+550-Multiline error for <>
+550 Here's the second line
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<z@remote.domain>
+550 Recipient not liked
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<z@remote.domain>
+550-Recipient not liked on two lines
+550 Here's the second
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<abcd@x.y.z>
+550 Not liked
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<abcd@x.y.z>
+550 Not liked
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<ok@localhost1>
+250 OK
+RSET
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<postmaster@localhost1>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<ok@localhost1>
+250 OK
+RSET
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<postmaster@localhost1>
+550 Don't like postmaster
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+LHLO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<z@remote.lmtp>
+550 Recipient not liked
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+End of script
diff --git a/test/stdout/0230 b/test/stdout/0230
new file mode 100644
index 000000000..d7d68d378
--- /dev/null
+++ b/test/stdout/0230
@@ -0,0 +1,75 @@
+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
+>>> mail from:<x@y.x>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
++++ 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
+>>> mail from:<x@y.x>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmaZ-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
++++ 1
+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
+>>> helo rhubarb
+??? 250
+<<< 250 myhost.test.ex Hello rhubarb [ip4.ip4.ip4.ip4]
+>>> mail from:<x@y.x>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmbA-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+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 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 192.168.1.2
+**** 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
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0231 b/test/stdout/0231
new file mode 100644
index 000000000..f74359cac
--- /dev/null
+++ b/test/stdout/0231
@@ -0,0 +1,37 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 OK
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<a@domain1>
+250 OK
+RCPT TO:<b@domain1>
+250 OK
+RCPT TO:<a@domain3>
+250 OK
+RCPT TO:<b@domain3>
+250 OK
+DATA
+354 OK
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+From:     a@test.ex, b@test.ex, a-rewrite@domain2,
+	b-rewrite@domain2, a@domain3, b@domain3
+To:       a@test.ex, b@test.ex, a-other@domain2,
+	b-other@domain2, a@domain3, b@domain3
+Reply-to: a@test.ex, b@test.ex, a-other@domain2,
+	b-other@domain2, a@domain3, b@domain3
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+Sender: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+220 OK
+End of script
diff --git a/test/stdout/0232 b/test/stdout/0232
new file mode 100644
index 000000000..55a07933b
--- /dev/null
+++ b/test/stdout/0232
@@ -0,0 +1,6 @@
+prefix-filter1.test.ex@myhost.test.ex
+    <-- filter1.test.ex@myhost.test.ex
+  router = rest, transport = local_delivery
+postmaster@myhost.test.ex
+    <-- filter1.test.ex@myhost.test.ex
+  router = rest, transport = local_delivery
diff --git a/test/stdout/0233 b/test/stdout/0233
new file mode 100644
index 000000000..773412dc5
--- /dev/null
+++ b/test/stdout/0233
@@ -0,0 +1,6 @@
+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
diff --git a/test/stdout/0234 b/test/stdout/0234
new file mode 100644
index 000000000..5609d5daf
--- /dev/null
+++ b/test/stdout/0234
@@ -0,0 +1,18 @@
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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 relay not permitted
+250 Accepted
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550 relay not permitted
+250 Accepted
+250 Accepted
+250 Accepted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0235 b/test/stdout/0235
new file mode 100644
index 000000000..125382e50
--- /dev/null
+++ b/test/stdout/0235
@@ -0,0 +1,2 @@
+xxx@myhost.test.ex is undeliverable:
+  Unrouteable address
diff --git a/test/stdout/0238 b/test/stdout/0238
new file mode 100644
index 000000000..095a764c8
--- /dev/null
+++ b/test/stdout/0238
@@ -0,0 +1,4 @@
+userx@test.ex cannot be resolved at this time:
+  failed to expand "${if eq{$local_part}" for require_files: missing 2nd string in {} after "eq"
+xxx@a.b.c cannot be resolved at this time:
+  require_files: "un/qualified" is not absolute
diff --git a/test/stdout/0239 b/test/stdout/0239
new file mode 100644
index 000000000..29766a24a
--- /dev/null
+++ b/test/stdout/0239
@@ -0,0 +1,13 @@
+userx@localhost
+  router = rrr, transport = local
+  host a.host.name           
+userx@localhost verified
+userx@localhost
+  router = rrr, transport = local
+  host a.host.name           
+userx@localhost
+  router = rrr, transport = local
+  host a.host.name           
+userx@smtp
+  router = sss, transport = smtp
+  host 127.0.0.1 [127.0.0.1] 
diff --git a/test/stdout/0240 b/test/stdout/0240
new file mode 100644
index 000000000..77e283c7e
--- /dev/null
+++ b/test/stdout/0240
@@ -0,0 +1 @@
+drwxrwsrwt
diff --git a/test/stdout/0241 b/test/stdout/0241
new file mode 100644
index 000000000..dc606c63c
--- /dev/null
+++ b/test/stdout/0241
@@ -0,0 +1 @@
+Message 10HmaX-0005vi-00 is no longer frozen
diff --git a/test/stdout/0242 b/test/stdout/0242
new file mode 100644
index 000000000..7dc9a2e1b
--- /dev/null
+++ b/test/stdout/0242
@@ -0,0 +1,52 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<abc@x.y.z>
+250 OK
+DATA
+354 Send more
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00
+	for abc@x.y.z; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<abc@x.y.z>
+250 OK
+DATA
+354 Send more
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaY-0005vi-00
+	for abc@x.y.z; Tue, 2 Mar 1999 09:44:33 +0000
+Subject: Test message
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0243 b/test/stdout/0243
new file mode 100644
index 000000000..fc0c2e907
--- /dev/null
+++ b/test/stdout/0243
@@ -0,0 +1,13 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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-myhost.test.ex Hello xxxx [1.2.3.4]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0244 b/test/stdout/0244
new file mode 100644
index 000000000..40eac3877
--- /dev/null
+++ b/test/stdout/0244
@@ -0,0 +1,5 @@
+> OK
+> OK
+> OK
+> OK
+> 
+\ No newline at end of file
diff --git a/test/stdout/0245 b/test/stdout/0245
new file mode 100644
index 000000000..a29cad618
--- /dev/null
+++ b/test/stdout/0245
@@ -0,0 +1,33 @@
+ 0m   sss 10HmaX-0005vi-00 <CALLER@myhost.test.ex>
+          "abc   def"@test.ex
+          xxx@yyy
+          aaa@bbb
+
+10HmaX-0005vi-00-H
+CALLER UID GID
+<CALLER@myhost.test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local
+-body_linecount 1
+-auth_id CALLER
+-auth_sender CALLER@myhost.test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-deliver_firsttime
+-local
+XX
+3
+"abc   def"@test.ex
+xxx@yyy
+aaa@bbb
+
+dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+036T To: <"abc
+   def"@test.ex>, xxx@yyy
+ddd* Bcc: aaa@bbb    
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+dddF From: CALLER_NAME <CALLER@myhost.test.ex>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0249 b/test/stdout/0249
new file mode 100644
index 000000000..68d431533
--- /dev/null
+++ b/test/stdout/0249
@@ -0,0 +1,16 @@
+  sender: User@b.domain
+    from: User@b.domain
+      to: User@b.domain
+      cc: User@b.domain
+     bcc: User@b.domain
+reply-to: User@b.domain
+env-from: User@b.domain
+  env-to: User@b.domain
+  sender: User@d.domain
+    from: User@d.domain
+      to: User@d.domain
+      cc: User@d.domain
+     bcc: User@d.domain
+reply-to: User@d.domain
+env-from: User@d.domain
+  env-to: User@d.domain
diff --git a/test/stdout/0250 b/test/stdout/0250
new file mode 100644
index 000000000..30fc9dc44
--- /dev/null
+++ b/test/stdout/0250
@@ -0,0 +1,85 @@
+10HmaX-0005vi-00-H
+CALLER UID GID
+<CALLER-rewritten@test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local
+-body_linecount 0
+-auth_id CALLER
+-auth_sender CALLER@test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-deliver_firsttime
+-local
+XX
+1
+SomeOne-rewritten@test.ex
+
+dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER-rewritten@test.ex>)
+	id 10HmaX-0005vi-00
+	for SomeOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+ddd* From: userx@test.ex
+dddF From: userx-rewritten@test.ex
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+ddd* X-rewrote-original-recipient: SomeOne@test.ex
+ddd* Sender: CALLER_NAME <CALLER@test.ex>
+dddS Sender: CALLER_NAME <CALLER-rewritten@test.ex>
+ddd* X-rewrote-sender: CALLER@test.ex
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+10HmaY-0005vi-00-H
+CALLER UID GID
+<CALLER-rewritten@test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local
+-body_linecount 0
+-auth_id CALLER
+-auth_sender CALLER@test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-deliver_firsttime
+-local
+XX
+1
+OtherOne-rewritten@test.ex
+
+dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER-rewritten@test.ex>)
+	id 10HmaY-0005vi-00
+	for OtherOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+ddd* From: usery@test.ex
+dddF From: usery-rewritten@test.ex
+047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+ddd* X-rewrote-original-recipient: OtherOne@test.ex
+ddd* Sender: CALLER_NAME <CALLER@test.ex>
+dddS Sender: CALLER_NAME <CALLER-rewritten@test.ex>
+ddd* X-rewrote-sender: CALLER@test.ex
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+10HmaZ-0005vi-00-H
+CALLER UID GID
+<CALLER-rewritten@test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local
+-body_linecount 0
+-auth_id CALLER
+-auth_sender CALLER@test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-deliver_firsttime
+-local
+XX
+1
+ThirdOne-rewritten@test.ex
+
+dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER-rewritten@test.ex>)
+	id 10HmaZ-0005vi-00
+	for ThirdOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+ddd* X-rewrote-original-recipient: ThirdOne@test.ex
+ddd* From: CALLER_NAME <CALLER@test.ex>
+dddF From: CALLER_NAME <CALLER-rewritten@test.ex>
+ddd* X-rewrote-sender: CALLER@test.ex
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0251 b/test/stdout/0251
new file mode 100644
index 000000000..40d1eba56
--- /dev/null
+++ b/test/stdout/0251
@@ -0,0 +1,34 @@
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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
+250 Reset OK
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+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
+>>> mail from:<ok@sender>
+??? 250
+<<< 250 OK
+>>> rcpt to:<oklist@listr.test.ex>
+??? 250
+<<< 250 Accepted
+>>> rset
+??? 250
+<<< 250 Reset OK
+>>> mail from:<bad@sender>
+??? 250
+<<< 250 OK
+>>> rcpt to:<oklist@listr.test.ex>
+??? 250
+<<< 250 Accepted
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/0253 b/test/stdout/0253
new file mode 100644
index 000000000..e289e817f
--- /dev/null
+++ b/test/stdout/0253
@@ -0,0 +1,66 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 PIPELINING
+MAIL FROM:<pqr=userx+myhost.test.ex@verp.domain>
+250 Sender OK
+RCPT TO:<userx@myhost.test.ex>
+250 Recipient OK
+DATA
+354 Go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <pqr@x.y.z>)
+	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: pqr@x.y.z
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message 3
+.
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 PIPELINING
+MAIL FROM:<pqr=phil+myhost.test.ex@verp.domain>
+250 Sender OK
+RCPT TO:<phil@myhost.test.ex>
+250 Recipient OK
+DATA
+354 Go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <pqr@x.y.z>)
+	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: pqr@x.y.z
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message 3
+.
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<pqr=fail+myhost.test.ex@verp.domain>
+250 Sender OK
+RCPT TO:<fail@myhost.test.ex>
+550 Recipient not OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0254 b/test/stdout/0254
new file mode 100644
index 000000000..00a654640
--- /dev/null
+++ b/test/stdout/0254
@@ -0,0 +1,95 @@
+10HmaX-0005vi-00-H
+CALLER UID GID
+<CALLER@myhost.test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local
+-body_linecount 0
+-auth_id CALLER
+-auth_sender CALLER@myhost.test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-deliver_firsttime
+-local
+XX
+1
+userx@myhost.test.ex
+
+dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+ddd* From: f
+dddF From: f@myhost.test.ex
+ddd* To: t
+021T To: t@myhost.test.ex
+008  Date: d
+011  Subject: s
+ddd* Resent-From: f
+dddF Resent-From: f@myhost.test.ex
+ddd* Resent-To: t
+028T Resent-To: t@myhost.test.ex
+015  Resent-Date: d
+033  Resent-Subject: should not exist
+054I Resent-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
+10HmaY-0005vi-00-H
+CALLER UID GID
+<CALLER@myhost.test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local
+-body_linecount 0
+-auth_id CALLER
+-auth_sender CALLER@myhost.test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-deliver_firsttime
+-local
+XX
+1
+userx@myhost.test.ex
+
+dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaY-0005vi-00
+	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+ddd* From: f
+dddF From: f@myhost.test.ex
+ddd* Resent-From: f
+dddF Resent-From: f@myhost.test.ex
+054I Resent-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
+045  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+10HmaZ-0005vi-00-H
+CALLER UID GID
+<CALLER@myhost.test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local
+-body_linecount 0
+-auth_id CALLER
+-auth_sender CALLER@myhost.test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-deliver_firsttime
+-local
+XX
+1
+userx@myhost.test.ex
+
+dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaZ-0005vi-00
+	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+ddd* From: userx
+dddF From: userx@myhost.test.ex
+ddd* To: xx@yy
+014T To: xxxx@yyyy
+ddd* Resent-From: userx
+dddF Resent-From: userx@myhost.test.ex
+ddd* Resent-To: xx@yy
+021T Resent-To: xxxx@yyyy
+054I Resent-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
+045  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0255 b/test/stdout/0255
new file mode 100644
index 000000000..149f6d5b2
--- /dev/null
+++ b/test/stdout/0255
@@ -0,0 +1,23 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+500 unrecognized command
+500 unrecognized command
+500 unrecognized command
+500 Too many unrecognized commands
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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
+500 unrecognized command
+500 unrecognized command
+500 unrecognized command
+500 Too many unrecognized commands
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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
+500 unrecognized command
+500 Too many unrecognized commands
diff --git a/test/stdout/0258 b/test/stdout/0258
new file mode 100644
index 000000000..824463e3e
--- /dev/null
+++ b/test/stdout/0258
@@ -0,0 +1,12 @@
+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=10HmbF-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmbG-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0259 b/test/stdout/0259
new file mode 100644
index 000000000..c4f4ea083
--- /dev/null
+++ b/test/stdout/0259
@@ -0,0 +1,93 @@
+
+**** 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 myhost.test.ex Hello abcd at a.b.c [127.0.0.1]
+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 myhost.test.ex Hello a.b.c [127.0.0.1]
+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 myhost.test.ex Hello ab\rcd at a.b.c [127.0.0.1]
+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 myhost.test.ex Hello abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefg at a.b.c [127.0.0.1]
+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 myhost.test.ex Hello a.b.c [127.0.0.1]
+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 myhost.test.ex Hello abcd at a.b.c [127.0.0.1]
+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 myhost.test.ex Hello abcd at a.b.c [127.0.0.1]
+221 myhost.test.ex closing connection
+
+******** SERVER ********
+Listening on port 1413 ... 
+Connection request from [127.0.0.1]
+<999 , 25
+>999 , 25 : USERID : UNIX :abcd
+End of script
+Listening on port 1413 ... 
+Connection request from [127.0.0.1]
+<999 , 25
+>>999 , 25 : USERID : UNIX :abcd
+End of script
+Listening on port 1413 ... 
+Connection request from [127.0.0.1]
+<999 , 25
+>999 , 25 : USERID : UNIX :ab
+cd
+End of script
+Listening on port 1413 ... 
+Connection request from [127.0.0.1]
+<999 , 25
+>999 , 25 : USERID : UNIX :abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++<<<
+End of script
+Listening on port 1413 ... 
+Connection request from [127.0.0.1]
+<999 , 25
+>999 , 25 : USERID : UNIX :abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++abcdefghijklmnopqrstuvwxyz++++
+End of script
+Listening on port 1413 ... 
+Connection request from [127.0.0.1]
+<999 , 25
+>999, 25 : USERID : UNIX :abcd
+End of script
+Listening on port 1413 ... 
+Connection request from [127.0.0.1]
+<999 , 25
+>999,25 : USERID : UNIX :abcd
+End of script
diff --git a/test/stdout/0263 b/test/stdout/0263
new file mode 100644
index 000000000..7eaaa387b
--- /dev/null
+++ b/test/stdout/0263
@@ -0,0 +1,6 @@
+x@domain0
+  router = r2, transport = t1
+x@domain1
+  router = pr1, transport = t1
+x@domain2 is undeliverable:
+  Unrouteable address
diff --git a/test/stdout/0264 b/test/stdout/0264
new file mode 100644
index 000000000..a6c9f3961
--- /dev/null
+++ b/test/stdout/0264
@@ -0,0 +1,14 @@
++++++++++++++++++++++++++++
+  T:userx@test.ex -22 xxxx mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/userx)
+first failed = time last try = time2 next try = time2 + 600
++++++++++++++++++++++++++++
+  T:userx@test.ex -22 xxxx mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/userx)
+first failed = time last try = time2 next try = time2 + 600
+  T:test.ex -22 xxxx mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/notuser)
+first failed = time last try = time2 next try = time2 + 1200
+Message 10HmaX-0005vi-00 has been removed
+Message 10HmbA-0005vi-00 has been removed
+Message 10HmbB-0005vi-00 has been removed
+Message 10HmbC-0005vi-00 has been removed
+Message 10HmbD-0005vi-00 has been removed
+Message 10HmbE-0005vi-00 has been removed
diff --git a/test/stdout/0265 b/test/stdout/0265
new file mode 100644
index 000000000..c63771904
--- /dev/null
+++ b/test/stdout/0265
@@ -0,0 +1,2 @@
+userx@x.y cannot be resolved at this time:
+  error in filter data: filtering not enabled
diff --git a/test/stdout/0267 b/test/stdout/0267
new file mode 100644
index 000000000..ef3e9babf
--- /dev/null
+++ b/test/stdout/0267
@@ -0,0 +1,6 @@
+pre-x@test.ex
+  router = r3, transport = t1
+x-post@test.ex
+  router = r3, transport = t1
+pre-z@test.ex is undeliverable:
+  Unrouteable address
diff --git a/test/stdout/0268 b/test/stdout/0268
new file mode 100644
index 000000000..6242b232d
--- /dev/null
+++ b/test/stdout/0268
@@ -0,0 +1,22 @@
+CALLER@r1 cannot be resolved at this time:
+  bad owner for TESTSUITE/test-owned-by-exim
+CALLER@r2 is undeliverable:
+  Explictly Rejected
+CALLER@r3 cannot be resolved at this time:
+  bad owner for TESTSUITE/test-owned-by-exim
+CALLER@r4 is undeliverable:
+  Explictly Rejected
+CALLER@r5 is undeliverable:
+  Explictly Rejected
+CALLER@r6 cannot be resolved at this time:
+  bad group for TESTSUITE/test-owned-by-exim
+CALLER@r7 is undeliverable:
+  Explictly Rejected
+CALLER@r8 is undeliverable:
+  Explictly Rejected
+CALLER@r9 is undeliverable:
+  Explictly Rejected
+CALLER@r10 cannot be resolved at this time:
+  bad group for TESTSUITE/test-owned-by-exim
+CALLER@r11 cannot be resolved at this time:
+  bad mode (0100644) for TESTSUITE/test-owned-by-exim: 04 bit(s) unexpected
diff --git a/test/stdout/0269 b/test/stdout/0269
new file mode 100644
index 000000000..c63771904
--- /dev/null
+++ b/test/stdout/0269
@@ -0,0 +1,2 @@
+userx@x.y cannot be resolved at this time:
+  error in filter data: filtering not enabled
diff --git a/test/stdout/0271 b/test/stdout/0271
new file mode 100644
index 000000000..ef3e9babf
--- /dev/null
+++ b/test/stdout/0271
@@ -0,0 +1,6 @@
+pre-x@test.ex
+  router = r3, transport = t1
+x-post@test.ex
+  router = r3, transport = t1
+pre-z@test.ex is undeliverable:
+  Unrouteable address
diff --git a/test/stdout/0272 b/test/stdout/0272
new file mode 100644
index 000000000..17f6d2b2a
--- /dev/null
+++ b/test/stdout/0272
@@ -0,0 +1,22 @@
+CALLER@r1 cannot be resolved at this time:
+  bad owner for TESTSUITE/aux-var/0272.exim
+CALLER@r2 is undeliverable:
+  Explictly Rejected
+CALLER@r3 cannot be resolved at this time:
+  bad owner for TESTSUITE/aux-var/0272.exim
+CALLER@r4 is undeliverable:
+  Explictly Rejected
+CALLER@r5 is undeliverable:
+  Explictly Rejected
+CALLER@r6 cannot be resolved at this time:
+  bad group for TESTSUITE/aux-var/0272.exim
+CALLER@r7 is undeliverable:
+  Explictly Rejected
+CALLER@r8 is undeliverable:
+  Explictly Rejected
+CALLER@r9 is undeliverable:
+  Explictly Rejected
+CALLER@r10 cannot be resolved at this time:
+  bad group for TESTSUITE/aux-var/0272.exim
+CALLER@r11 cannot be resolved at this time:
+  bad mode (0100644) for TESTSUITE/aux-var/0272.exim: 04 bit(s) unexpected
diff --git a/test/stdout/0273 b/test/stdout/0273
new file mode 100644
index 000000000..0527700f6
--- /dev/null
+++ b/test/stdout/0273
@@ -0,0 +1,27 @@
+userx@r1
+  router = r1, transport = t1
+userx@r2
+  router = r2, transport = t1
+userx@r3 cannot be resolved at this time:
+  require_files: error for TESTSUITE/aux-var/0273.exim: Permission denied
+userx@r4 cannot be resolved at this time:
+  user "non-existant" for require_files not found
+userx@r5 cannot be resolved at this time:
+  group missing after numerical uid 1 for require_files
+userx@r6
+  router = r6, transport = t1
+userx@r7 is undeliverable:
+  Unrouteable address
+userx@r8 is undeliverable:
+  Unrouteable address
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 <userx@r1> is deliverable
+250 <userx@r2> is deliverable
+451 <userx@r3> require_files: error for TESTSUITE/aux-var/0273.exim: Permission denied
+451 <userx@r4> user "non-existant" for require_files not found
+451 <userx@r5> group missing after numerical uid 1 for require_files
+250 <userx@r6> is deliverable
+550 <userx@r7> Unrouteable address
+550 <userx@r8> Unrouteable address
+250 <userx@r9> is deliverable
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0275 b/test/stdout/0275
new file mode 100644
index 000000000..fa02efa75
--- /dev/null
+++ b/test/stdout/0275
@@ -0,0 +1,2 @@
+userx@test.ex
+  router = r3, transport = t1
diff --git a/test/stdout/0276 b/test/stdout/0276
new file mode 100644
index 000000000..226da3b20
--- /dev/null
+++ b/test/stdout/0276
@@ -0,0 +1,33 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@test.ex>
+250 OK
+DATA
+500 NO
+QUIT
+200 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@test.ex>
+250 OK
+DATA
+500 NO
+QUIT
+200 OK
+End of script
diff --git a/test/stdout/0277 b/test/stdout/0277
new file mode 100644
index 000000000..7a823a4cc
--- /dev/null
+++ b/test/stdout/0277
@@ -0,0 +1,35 @@
+
+**** SMTP testing session as if from host V4NET.2.3.4
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.6.7.8
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.10.11.12
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.1.1.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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.2.2.2
+**** 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
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0278 b/test/stdout/0278
new file mode 100644
index 000000000..9667c18ac
--- /dev/null
+++ b/test/stdout/0278
@@ -0,0 +1,4 @@
+CALLER@test.ex
+  router = r3, transport = t1
+unknown@test.ex is undeliverable:
+  Unrouteable address
diff --git a/test/stdout/0279 b/test/stdout/0279
new file mode 100644
index 000000000..295fe2a4b
--- /dev/null
+++ b/test/stdout/0279
@@ -0,0 +1,4 @@
+CALLER@test.ex
+  router = r3, transport = t1
+CALLER@test.ex is undeliverable:
+  matched *@+funny_domains
diff --git a/test/stdout/0281 b/test/stdout/0281
new file mode 100644
index 000000000..4b4b307fc
--- /dev/null
+++ b/test/stdout/0281
@@ -0,0 +1,54 @@
+
+**** SMTP testing session as if from host V4NET.1.1.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
+250 Accepted
+550 domain doesn't match @ or @[]
+250 Accepted
+250 Accepted
+250 Accepted
+550 domain doesn't match @mx_any
+550 domain doesn't match @mx_any
+250 Accepted
+550 domain doesn't match @mx_primary
+550 domain doesn't match @mx_primary
+550 domain doesn't match @mx_primary
+550 domain doesn't match @mx_secondary
+250 Accepted
+550 domain doesn't match @mx_secondary
+550 domain doesn't match @mx_secondary
+550 host doesn't match @ or @[]
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.10.10.10
+**** 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
+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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.1.1.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
+550 domain doesn't match @mx_primary
+250 Accepted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0282 b/test/stdout/0282
new file mode 100644
index 000000000..edc2ea42c
--- /dev/null
+++ b/test/stdout/0282
@@ -0,0 +1,58 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test message.
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Connecting to 127.0.0.1 port 1226 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test message.
+>>> .
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/0285 b/test/stdout/0285
new file mode 100644
index 000000000..37a681a08
--- /dev/null
+++ b/test/stdout/0285
@@ -0,0 +1,130 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250  HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<a@test.ex>
+250 Recipient OK
+RCPT TO:<b@test.ex>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<c@test.ex>
+550 Recipient not OK
+RCPT TO:<d@test.ex>
+550 Recipient not OK
+RSET
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<e@test.ex>
+250 Recipient OK
+RCPT TO:<f@test.ex>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250  HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<a@test.ex>
+250 Recipient OK
+RCPT TO:<b@test.ex>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<c@test.ex>
+550 Recipient not OK
+RCPT TO:<d@test.ex>
+550 Recipient not OK
+RSET
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<e@test.ex>
+250 Recipient OK
+RCPT TO:<f@test.ex>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250  HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<g@test.ex>
+250 Recipient OK
+RCPT TO:<h@test.ex>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0286 b/test/stdout/0286
new file mode 100644
index 000000000..993817efa
--- /dev/null
+++ b/test/stdout/0286
@@ -0,0 +1,141 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<a@test.ex>
+250 Recipient OK
+RCPT TO:<b@test.ex>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<c@test.ex>
+550 Recipient not OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<d@test.ex>
+550 Recipient not OK
+RCPT TO:<e@test.ex>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<f@test.ex>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<a@test.ex>
+550 Recipient not OK
+RCPT TO:<b@test.ex>
+550 Recipient not OK
+RSET
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<c@test.ex>
+250 Recipient OK
+RCPT TO:<d@test.ex>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<e@test.ex>
+550 Recipient not OK
+RCPT TO:<f@test.ex>
+550 Recipient not OK
+RSET
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<g@test.ex>
+250 Recipient OK
+RCPT TO:<h@test.ex>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0287 b/test/stdout/0287
new file mode 100644
index 000000000..db19782a2
--- /dev/null
+++ b/test/stdout/0287
@@ -0,0 +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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-ETRN
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> ETRN one
+??? 250
+<<< 250 OK
+>>> ETRN one
+??? 458
+<<< 458 Already processing one
+>>> ETRN two
+??? 250
+<<< 250 OK
++++ 2
+>>> ETRN one
+??? 250
+<<< 250 OK
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/0288 b/test/stdout/0288
new file mode 100644
index 000000000..8f36a023d
--- /dev/null
+++ b/test/stdout/0288
@@ -0,0 +1,27 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+*sleep 2
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<a@test.ex>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0290 b/test/stdout/0290
new file mode 100644
index 000000000..9258634fe
--- /dev/null
+++ b/test/stdout/0290
@@ -0,0 +1,8 @@
+local_interfaces = 127.0.0.1 : V4NET.1.2.3 : ip4.ip4.ip4.ip4
+message_size_limit = 500
+recipients_max = 1
+remote_sort_domains = a:b:c
+receive_timeout = 1s
+receive_timeout = 0s
+receive_timeout = 0s
+receive_timeout = 4s
diff --git a/test/stdout/0291 b/test/stdout/0291
new file mode 100644
index 000000000..8207fc398
--- /dev/null
+++ b/test/stdout/0291
@@ -0,0 +1,13 @@
+c@one
+    <-- b@one
+    <-- a@one
+  router = accept, transport = unset
+c@one
+    <-- b@one
+  router = accept, transport = unset
+b@two
+    <-- a@two
+  router = accept, transport = unset
+c@two
+    <-- b@two
+  router = accept, transport = unset
diff --git a/test/stdout/0293 b/test/stdout/0293
new file mode 100644
index 000000000..63b499c00
--- /dev/null
+++ b/test/stdout/0293
@@ -0,0 +1,18 @@
+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
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+421 too many messages in this connection
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Reset OK
+250 OK
+250 Reset OK
+421 too many messages in this connection
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0294 b/test/stdout/0294
new file mode 100644
index 000000000..c1548160d
--- /dev/null
+++ b/test/stdout/0294
@@ -0,0 +1,48 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+250 OK
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550 Administrative prohibition
+550 Administrative prohibition
+550 Administrative prohibition
+550 Administrative prohibition
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+250 Reset OK
+250 OK
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0297 b/test/stdout/0297
new file mode 100644
index 000000000..060a8956b
--- /dev/null
+++ b/test/stdout/0297
@@ -0,0 +1,8 @@
+/a/b/c@myhost.test.ex -> /a/b/c 
+  transport = tf1
+/x/y/z@myhost.test.ex -> /x/y/z 
+  transport = tf2
+/a/b/c/@myhost.test.ex -> /a/b/c/ 
+  transport = td1
+/a/a/b//@myhost.test.ex -> /a/a/b// 
+  transport = td2
diff --git a/test/stdout/0299 b/test/stdout/0299
new file mode 100644
index 000000000..798f402e6
--- /dev/null
+++ b/test/stdout/0299
@@ -0,0 +1,43 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<xyz1@ex.test>
+250 Recipient OK
+RCPT TO:<xyz2@ex.test>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<xyz3@ex.test>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0300 b/test/stdout/0300
new file mode 100644
index 000000000..a41df39d3
--- /dev/null
+++ b/test/stdout/0300
@@ -0,0 +1,140 @@
+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 abcd\r\nmail from:<userx@test.ex>
+??? 554
+<<< 554 SMTP synchronization error
+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
+>>> ehlo abcd
+??? 250-
+<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> rset\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
+??? 250
+<<< 250 Reset OK
+??? 250
+<<< 250 OK
+??? 250
+<<< 250 Accepted
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> the message
+>>> .\r\nmail from:<userx@test.ex>
++++ 1
+>>> rcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+??? 250
+<<< 250 OK
+??? 250
+<<< 250 Accepted
+??? 554
+<<< 554 SMTP synchronization error
+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 abcd
+??? 250
+<<< 250 myhost.test.ex Hello abcd [127.0.0.1]
+>>> mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>
+??? 554
+<<< 554 SMTP synchronization error
+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 abcd
+??? 250-
+<<< 250-myhost.test.ex Hello abcd [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>
+??? 554
+<<< 554 SMTP synchronization error
+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
+>>> junk0
+??? 500
+<<< 500 unrecognized command
+>>> junk1\r\njunk2
+??? 554
+<<< 554 SMTP synchronization error
+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
+>>> ehlo abcd
+??? 250-
+<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> rset\r\nquit
+??? 250
+<<< 250 Reset OK
+??? 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 abcd
+??? 250-
+<<< 250-myhost.test.ex Hello abcd [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250
+<<< 250 HELP
+>>> rset\r\nquit
+??? 554
+<<< 554 SMTP synchronization error
+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
+>>> ehlo dis.able
+??? 250-
+<<< 250-myhost.test.ex Hello dis.able [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line
+>>> .
+??? 250
+<<< 250 OK
+??? 250
+<<< 250 Accepted
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Connecting to 127.0.0.1 port 1225 ... connected
+>>> helo abcd
+??? 554
+<<< 554 SMTP synchronization error
+End of script
+Connecting to 127.0.0.1 port 1225 ... connected
+End of script
diff --git a/test/stdout/0301 b/test/stdout/0301
new file mode 100644
index 000000000..198962d06
--- /dev/null
+++ b/test/stdout/0301
@@ -0,0 +1,75 @@
+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 abcd\r\nmail from:<userx@test.ex>
+??? 250-
+<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+??? 250
+<<< 250 OK
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo abcd
+??? 250-
+<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
+??? 250
+<<< 250 OK
+??? 250
+<<< 250 Accepted
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> the message
+>>> .\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+??? 250
+<<< 250 OK
+??? 250
+<<< 250 Accepted
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo en.force
+??? 250-
+<<< 250-myhost.test.ex Hello en.force [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
+>>> .
+??? 250
+<<< 250 OK
+??? 250
+<<< 250 Accepted
+??? 554
+<<< 554 SMTP synchronization error
+End of script
diff --git a/test/stdout/0302 b/test/stdout/0302
new file mode 100644
index 000000000..8667de1c0
--- /dev/null
+++ b/test/stdout/0302
@@ -0,0 +1,4 @@
+ 0m   sss 10HmaX-0005vi-00 <CALLER@myhost.test.ex>
+        D abcd@myhost.test.ex
+          defer@myhost.test.ex
+
diff --git a/test/stdout/0303 b/test/stdout/0303
new file mode 100644
index 000000000..19e444afa
--- /dev/null
+++ b/test/stdout/0303
@@ -0,0 +1,63 @@
+
+**** SMTP testing session as if from host V4NET.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 myhost.test.ex Hello ten-1.test.ex [V4NET.0.0.1]
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.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-myhost.test.ex Hello ten-1.test.ex [V4NET.0.0.1]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.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 myhost.test.ex Hello rhubarb.custard [V4NET.0.0.1]
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.2.3.4
+**** 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-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+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 V4NET.2.3.4
+**** 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-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+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/0304 b/test/stdout/0304
new file mode 100644
index 000000000..2ff1e3ea3
--- /dev/null
+++ b/test/stdout/0304
@@ -0,0 +1,37 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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 failed 7
+550 failed 8
+250 Accepted
+250 Reset OK
+250 OK
+550 failed 1
+550 failed 1
+550 failed 1
+250 Accepted
+550 failed 2
+550 failed 2
+250 Accepted
+550 failed 3
+550 failed 3
+550 failed 3
+250 Accepted
+550 failed 4
+550 failed 4
+250 Accepted
+550 failed 5
+550 failed 5
+250 Accepted
+250 Accepted
+550 failed 6
+250 Accepted
+550 failed 9
+550 failed 10
+250 Accepted
+550 failed 11
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0305 b/test/stdout/0305
new file mode 100644
index 000000000..8f4e6ff48
--- /dev/null
+++ b/test/stdout/0305
@@ -0,0 +1,13 @@
+
+**** SMTP testing session as if from host V4NET.2.3.4
+**** 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
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+x@ten-1.test.ex verified
+x@junk.junk failed to verify:
+  Unrouteable address
diff --git a/test/stdout/0306 b/test/stdout/0306
new file mode 100644
index 000000000..cc6990ef3
--- /dev/null
+++ b/test/stdout/0306
@@ -0,0 +1,18 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 list1@lists.test.ex is a closed mailing list
+250 Reset OK
+250 OK
+550 nonlist@lists.test.ex is a closed mailing list
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0308 b/test/stdout/0308
new file mode 100644
index 000000000..7a003dc06
--- /dev/null
+++ b/test/stdout/0308
@@ -0,0 +1,18 @@
+
+**** SMTP testing session as if from host V4NET.0.0.97
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.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
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0311 b/test/stdout/0311
new file mode 100644
index 000000000..b563d1cd4
--- /dev/null
+++ b/test/stdout/0311
@@ -0,0 +1,54 @@
+10HmaX-0005vi-00-H
+CALLER UID GID
+<CALLER@myhost.test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local
+-body_linecount 0
+-auth_id CALLER
+-auth_sender CALLER@myhost.test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-deliver_firsttime
+-local
+XX
+1
+xx@myhost.test.ex
+
+dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for xx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+ddd* return-path: x@y
+ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
+ddd* envelope-to: p@q
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+dddF From: CALLER_NAME <CALLER@myhost.test.ex>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+10HmaY-0005vi-00-H
+CALLER UID GID
+<CALLER@myhost.test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local
+-body_linecount 0
+-auth_id CALLER
+-auth_sender CALLER@myhost.test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-deliver_firsttime
+-local
+XX
+1
+xx@myhost.test.ex
+
+dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaY-0005vi-00
+	for xx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+017  return-path: x@y
+ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
+ddd* envelope-to: p@q
+047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+dddF From: CALLER_NAME <CALLER@myhost.test.ex>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0312 b/test/stdout/0312
new file mode 100644
index 000000000..eed6d39b5
--- /dev/null
+++ b/test/stdout/0312
@@ -0,0 +1,9 @@
+
+**** SMTP testing session as if from host V4NET.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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0314 b/test/stdout/0314
new file mode 100644
index 000000000..b6b0ef461
--- /dev/null
+++ b/test/stdout/0314
@@ -0,0 +1,13 @@
+
+**** SMTP testing session as if from host V4NET.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+554 SMTP service not available
+
+**** SMTP testing session as if from host V4NET.0.0.2
+**** 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
+421 the.local.host.name lost input connection
diff --git a/test/stdout/0316 b/test/stdout/0316
new file mode 100644
index 000000000..e26b82a1f
--- /dev/null
+++ b/test/stdout/0316
@@ -0,0 +1,12 @@
+Warning: no message headers read
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0316.f-user"
+
+Testprint: 1 Matched c@d
+Testprint: 2 Matched c@d
+Testprint: 3 Matched cc@dd
+Testprint: 4 Matched e@f
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
diff --git a/test/stdout/0317 b/test/stdout/0317
new file mode 100644
index 000000000..b2a5231e5
--- /dev/null
+++ b/test/stdout/0317
@@ -0,0 +1,10 @@
+ 0m   sss 10HmaX-0005vi-00 <CALLER@test.ex>
+          x@y.z
+          a@b.c
+          p@q.r
+
+ 0m   sss 10HmaY-0005vi-00 <CALLER@test.ex>
+          aa@bb.cc
+          pp@qq.rr
+          xx@yy.zz
+
diff --git a/test/stdout/0320 b/test/stdout/0320
new file mode 100644
index 000000000..18ba56443
--- /dev/null
+++ b/test/stdout/0320
@@ -0,0 +1,12 @@
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+550 Administrative prohibition
+250 Accepted
+550 Administrative prohibition
+221 the.local.host.name closing connection
diff --git a/test/stdout/0322 b/test/stdout/0322
new file mode 100644
index 000000000..7bf7be255
--- /dev/null
+++ b/test/stdout/0322
@@ -0,0 +1,128 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 PIPELINING
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<x@test.ex>
+250 Recipient OK
+DATA
+>
+Unexpected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 PIPELINING
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<x@test.ex>
+>
+DATA
+550 Failed DATA
+Unexpected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 PIPELINING
+MAIL FROM:<CALLER@myhost.test.ex>
+>
+RCPT TO:<x@test.ex>
+550 Can't send RCPT
+DATA
+550 Can't send DATA
+Unexpected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 PIPELINING
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<x@test.ex>
+250 First RCPT OK
+RCPT TO:<y@test.ex>
+>
+250 Second RCPT malformed
+RCPT TO:<z@test.ex>
+250 Third RCPT OK
+DATA
+550 Failed DATA
+Unexpected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 PIPELINING
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<a@test.ex>
+450 Recipient bad
+RCPT TO:<b@test.ex>
+450 Recipient bad
+DATA
+550 Data not expected
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<x@test.ex>
+250 Recipient OK
+DATA
+>
+Unexpected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<x@test.ex>
+>
+Unexpected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+>
+Unexpected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<x@test.ex>
+250 First RCPT OK
+RCPT TO:<y@test.ex>
+>
+250 Second RCPT malformed
+Unexpected EOF read from client
diff --git a/test/stdout/0323 b/test/stdout/0323
new file mode 100644
index 000000000..136a4d85e
--- /dev/null
+++ b/test/stdout/0323
@@ -0,0 +1,3 @@
+x@y
+  router = r1, transport = t1
+  host quoted.y           
diff --git a/test/stdout/0325 b/test/stdout/0325
new file mode 100644
index 000000000..91e52a8c3
--- /dev/null
+++ b/test/stdout/0325
@@ -0,0 +1,11 @@
+xxx@a.b.c
+  router = r4, transport = t1
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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 $domain_data=DOMAIN DATA $local_part_data=LOCAL PART DATA
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0331 b/test/stdout/0331
new file mode 100644
index 000000000..ce689ecb7
--- /dev/null
+++ b/test/stdout/0331
@@ -0,0 +1,90 @@
+    SMTP: p@q
+  sender: x@y
+    from: x@y
+      to: x@y
+      cc: x@y
+     bcc: x@y
+reply-to: x@y
+env-from: x@y
+  env-to: x@y
+    SMTP: p@q
+  sender: a@b
+    from: a@b
+      to: a@b
+      cc: a@b
+     bcc: a@b
+reply-to: a@b
+env-from: a@b
+  env-to: a@b
+  sender: =?ISO-8859-1?Q?A=C4=C5=C6Z?= <2047@x.y>
+    from: =?ISO-8859-1?Q?A=C4=C5=C6Z?= <2047@x.y>
+      to: =?ISO-8859-1?Q?A=C4=C5=C6Z?= <2047@x.y>
+      cc: =?ISO-8859-1?Q?A=C4=C5=C6Z?= <2047@x.y>
+     bcc: =?ISO-8859-1?Q?A=C4=C5=C6Z?= <2047@x.y>
+reply-to: =?ISO-8859-1?Q?A=C4=C5=C6Z?= <2047@x.y>
+env-from: 2047@x.y
+  env-to: 2047@x.y
+  sender: unq1@x.y
+    from: unq1@x.y
+      to: unq1@x.y
+      cc: unq1@x.y
+     bcc: unq1@x.y
+reply-to: unq1@x.y
+env-from: unq1@x.y
+  env-to: unq1@x.y
+  sender: a phrase <unq2@test.ex>
+    from: a phrase <unq2@test.ex>
+      to: a phrase <unq2@test.ex>
+      cc: a phrase <unq2@test.ex>
+     bcc: a phrase <unq2@test.ex>
+reply-to: a phrase <unq2@test.ex>
+env-from: unq2@test.ex
+  env-to: unq2@test.ex
+  sender: unq3@test.ex
+    from: unq3@test.ex
+      to: unq3@test.ex
+      cc: unq3@test.ex
+     bcc: unq3@test.ex
+reply-to: unq3@test.ex
+env-from: unq3@test.ex
+  env-to: unq3@test.ex
+  sender: "a 4. phrase" <4@22> =?ISO-8859-1?Q?=28a_comment_A=C4=C5=C6Z=29?=
+    from: "a 4. phrase" <4@22> =?ISO-8859-1?Q?=28a_comment_A=C4=C5=C6Z=29?=
+      to: "a 4. phrase" <4@22> =?ISO-8859-1?Q?=28a_comment_A=C4=C5=C6Z=29?=
+      cc: "a 4. phrase" <4@22> =?ISO-8859-1?Q?=28a_comment_A=C4=C5=C6Z=29?=
+     bcc: "a 4. phrase" <4@22> =?ISO-8859-1?Q?=28a_comment_A=C4=C5=C6Z=29?=
+reply-to: "a 4. phrase" <4@22> =?ISO-8859-1?Q?=28a_comment_A=C4=C5=C6Z=29?=
+env-from: 4@22
+  env-to: 4@22
+  sender: fw@fw
+    from: harry <harry@we.de>
+      to: fw@fw
+      cc: fw@fw
+     bcc: fw@fw
+reply-to: fw@fw
+env-from: fw@fw
+  env-to: fw@fw
+  sender: gw@fw
+    from: =?ISO-8859-1?Q?h=E4rry?= <harry@we.de>
+      to: gw@fw
+      cc: gw@fw
+     bcc: gw@fw
+reply-to: gw@fw
+env-from: gw@fw
+  env-to: gw@fw
+  sender: was-abc@abc
+    from: was-abc@abc
+      to: was-abc@abc
+      cc: was-abc@abc
+     bcc: was-abc@abc
+reply-to: was-abc@abc
+env-from: was-abc@abc
+  env-to: was-abc@abc
+  sender: ABC@abc
+    from: ABC@abc
+      to: ABC@abc
+      cc: ABC@abc
+     bcc: ABC@abc
+reply-to: ABC@abc
+env-from: ABC@abc
+  env-to: ABC@abc
diff --git a/test/stdout/0332 b/test/stdout/0332
new file mode 100644
index 000000000..d1593fa4e
--- /dev/null
+++ b/test/stdout/0332
@@ -0,0 +1,45 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<ok@no.delay>
+250 Recipient OK
+DATA
+354 Go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00
+	for ok@no.delay; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Message 1
+.
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<ok@no.delay>
+250 Recipient OK
+DATA
+354 Go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Message 2
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0333 b/test/stdout/0333
new file mode 100644
index 000000000..d1593fa4e
--- /dev/null
+++ b/test/stdout/0333
@@ -0,0 +1,45 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 PIPELINING
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<ok@no.delay>
+250 Recipient OK
+DATA
+354 Go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00
+	for ok@no.delay; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Message 1
+.
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 Sender OK
+RCPT TO:<ok@no.delay>
+250 Recipient OK
+DATA
+354 Go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Message 2
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0334 b/test/stdout/0334
new file mode 100644
index 000000000..a116ac8df
--- /dev/null
+++ b/test/stdout/0334
@@ -0,0 +1,2 @@
+x@y cannot be resolved at this time:
+  remote host address is the local host
diff --git a/test/stdout/0337 b/test/stdout/0337
new file mode 100644
index 000000000..a3f1e06e6
--- /dev/null
+++ b/test/stdout/0337
@@ -0,0 +1,3 @@
+userx@test.ex verified
+userx@test.ex
+  router = r1, transport = t1
diff --git a/test/stdout/0338 b/test/stdout/0338
new file mode 100644
index 000000000..870dc3b55
--- /dev/null
+++ b/test/stdout/0338
@@ -0,0 +1,29 @@
+ 0m   sss 10HmaX-0005vi-00 <CALLER@test.ex>
+        D userx@test.ex
+          a1-userx@test.ex
+
+10HmaX-0005vi-00-H
+CALLER UID GID
+<CALLER@test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local
+-body_linecount 0
+-auth_id CALLER
+-auth_sender CALLER@test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-local
+NY a2-userx@test.ex
+NN userx@test.ex
+2
+userx@test.ex
+a1-userx@test.ex postmaster@test.ex 18,0#1
+
+dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+dddF From: CALLER_NAME <CALLER@test.ex>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0340 b/test/stdout/0340
new file mode 100644
index 000000000..057562f13
--- /dev/null
+++ b/test/stdout/0340
@@ -0,0 +1,4 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0342 b/test/stdout/0342
new file mode 100644
index 000000000..5ccb71fe5
--- /dev/null
+++ b/test/stdout/0342
@@ -0,0 +1,9 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0343 b/test/stdout/0343
new file mode 100644
index 000000000..dbcd79079
--- /dev/null
+++ b/test/stdout/0343
@@ -0,0 +1,6 @@
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:1223 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 600
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:1223 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 600
diff --git a/test/stdout/0344 b/test/stdout/0344
new file mode 100644
index 000000000..2452f7692
--- /dev/null
+++ b/test/stdout/0344
@@ -0,0 +1,12 @@
+x@d1
+  router = r1, transport = t1
+  host 192.168.4.3 [192.168.4.3] 
+x@d2
+  router = r2, transport = t2
+  host V4NET.9.8.7 [V4NET.9.8.7] 
+x@d30
+  router = r3, transport = t4
+  host 1.2.3.4 [1.2.3.4] 
+x@d31
+  router = r3, transport = t3
+  host 1.2.3.4 [1.2.3.4] 
diff --git a/test/stdout/0345 b/test/stdout/0345
new file mode 100644
index 000000000..1fa2305cd
--- /dev/null
+++ b/test/stdout/0345
@@ -0,0 +1,14 @@
++++++++++++++++++++++++++++
+  T:a@test.ex -22 xxxx mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/a)
+first failed = time last try = time2 next try = time2 + 20
+-rw------- 1 CALLER CALLER 0 May 10 2002 TESTSUITE/test-mail/a
++++++++++++++++++++++++++++
+  T:a@test.ex -22 xxxx mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/a)
+first failed = time last try = time2 next try = time2 + 0 *
+  T:CALLER@test.ex -22 xxxx mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/CALLER)
+first failed = time last try = time2 next try = time2 + 20
++++++++++++++++++++++++++++
+  T:a@test.ex -22 xxxx mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/a)
+first failed = time last try = time2 next try = time2 + 0 *
+  T:CALLER@test.ex -22 xxxx mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/CALLER)
+first failed = time last try = time2 next try = time2 + 20
diff --git a/test/stdout/0350 b/test/stdout/0350
new file mode 100644
index 000000000..b17b1bebe
--- /dev/null
+++ b/test/stdout/0350
@@ -0,0 +1,4 @@
+xx@yy
+  router = r1, transport = t1
+  host 1.2.3.4 [1.2.3.4]    
+  host other2.test.ex [V4NET.12.3.2] 
diff --git a/test/stdout/0357 b/test/stdout/0357
new file mode 100644
index 000000000..51545f157
--- /dev/null
+++ b/test/stdout/0357
@@ -0,0 +1,47 @@
++++++++++++++++++++++++++++
+  R:userx@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+first failed = time last try = time2 next try = time2 + 1
++++++++++++++++++++++++++++
+  R:userx@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+first failed = time last try = time2 next try = time2 + 1
++++++++++++++++++++++++++++
+  R:userx@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+first failed = time last try = time2 next try = time2 + 2
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@test.ex>
+451 Temporary error
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@test.ex>
+451 Temporary error
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@test.ex>
+451 Temporary error
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0358 b/test/stdout/0358
new file mode 100644
index 000000000..314342dc6
--- /dev/null
+++ b/test/stdout/0358
@@ -0,0 +1,40 @@
++++++++++++++++++++++++++++
+  R:userx@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+first failed = time last try = time2 next try = time2 + 1
+  R:usery@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+first failed = time last try = time2 next try = time2 + 1
++++++++++++++++++++++++++++
+  R:userx@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+first failed = time last try = time2 next try = time2 + 2
+  R:usery@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+first failed = time last try = time2 next try = time2 + 2
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@test.ex>
+451 Temporary error
+RCPT TO:<usery@test.ex>
+451 Temporary error
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@test.ex>
+451 Temporary error
+RCPT TO:<usery@test.ex>
+451 Temporary error
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0360 b/test/stdout/0360
new file mode 100644
index 000000000..9ff9b176f
--- /dev/null
+++ b/test/stdout/0360
@@ -0,0 +1,5 @@
+ 0m   sss 10HmaX-0005vi-00 <CALLER@test.ex>
+          cms@test.ex
+       +D unknown@recurse.test.ex
+       +D unknown@recurse.test.ex.test.ex
+
diff --git a/test/stdout/0362 b/test/stdout/0362
new file mode 100644
index 000000000..f0eabc319
--- /dev/null
+++ b/test/stdout/0362
@@ -0,0 +1,9 @@
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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 OK
+250 Accepted
+221 the.local.host.name closing connection
diff --git a/test/stdout/0363 b/test/stdout/0363
new file mode 100644
index 000000000..a3160693f
--- /dev/null
+++ b/test/stdout/0363
@@ -0,0 +1,27 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220
+EHLO the.local.host.name
+220 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<Aa@Bb>
+250 OK
+DATA
+334 send more
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00
+	for Aa%Bb@Cc; Tue, 2 Mar 1999 09:44:33 +0000
+To: aa%bb@cc
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0364 b/test/stdout/0364
new file mode 100644
index 000000000..38b2cf777
--- /dev/null
+++ b/test/stdout/0364
@@ -0,0 +1,14 @@
+kilos@thishost.test.ex
+    <-- kilos@thishost
+  router = r5, transport = t2
+solik@otherhost is undeliverable:
+  Can't route to otherhost.sub.test.ex
+xxx@ten-1.test.ex
+    <-- xxx@ten-1
+  router = r2, transport = t1
+  host ten-1.test.ex [V4NET.0.0.1] 
+xxx@testsub.sub.test.ex
+    <-- xxx@testsub.test.ex
+    <-- xxx@testsub
+  router = r2, transport = t1
+  host testsub.sub.test.ex [V4NET.99.0.3] 
diff --git a/test/stdout/0365 b/test/stdout/0365
new file mode 100644
index 000000000..dbc30953f
--- /dev/null
+++ b/test/stdout/0365
@@ -0,0 +1,72 @@
+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
+550 Administrative prohibition
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+250 OK
+451 Could not complete sender verify callout
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+250 OK
+451 Could not complete recipient verify callout
+250 Reset OK
+250 OK
+550 failure message
+250 Reset OK
+250 OK
+451 Temporary local problem - please try later
+250 Reset OK
+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
+354 Enter message, ending with "." on a line by itself
+550-Rejected after DATA: '>' missing at end of address:
+550 failing address in "From" header is: <bad@syntax
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550-Rejected after DATA: could not verify "From:" header address
+550 bad@domain: Unrouteable address
+250 OK
+451-could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
+451-Could not complete sender verify callout for <callout@x>.
+451-The mail server(s) for the domain may be temporarily unreachable, or
+451-they may be permanently unreachable from this server. In the latter case,
+451-you need to change the address or create an MX record for its domain
+451-if it is supposed to be generally accessible from the Internet.
+451 Talk to your mail administrator for details.
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550-Rejected after DATA: could not verify "From:" header address
+550 unverifiable@y: Unrouteable address
+250 OK
+451-Could not complete recipient verify callout for <callout@y>.
+451-The mail server(s) for the domain may be temporarily unreachable, or
+451-they may be permanently unreachable from this server. In the latter case,
+451 the address will never be accepted.
+250 Reset OK
+250 OK
+550 failure message
+250 Reset OK
+250 Reset OK
+250 OK
+451 defer message
+221 the.local.host.name closing connection
diff --git a/test/stdout/0366 b/test/stdout/0366
new file mode 100644
index 000000000..e72a08edb
--- /dev/null
+++ b/test/stdout/0366
@@ -0,0 +1 @@
+Retry rule: ^[^@]+@ten-  *  F,2s,1s; 
diff --git a/test/stdout/0367 b/test/stdout/0367
new file mode 100644
index 000000000..b54aff8ff
--- /dev/null
+++ b/test/stdout/0367
@@ -0,0 +1,79 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@domain1>
+250 OK
+DATA
+354 More...
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message 1
+.
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@domain1>
+250 OK
+DATA
+354 More...
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmbA-0005vi-00
+	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message 4
+.
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@domain1>
+250 OK
+DATA
+354 More...
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaZ-0005vi-00
+	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message 3
+.
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@domain1>
+250 OK
+DATA
+354 More...
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaY-0005vi-00
+	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message 2
+.
+250 OK
+QUIT
+220 OK
+End of script
diff --git a/test/stdout/0368 b/test/stdout/0368
new file mode 100644
index 000000000..cfd96796e
--- /dev/null
+++ b/test/stdout/0368
@@ -0,0 +1,14 @@
+x@mxt9.test.ex
+  router = r2, transport = t1
+  host ten-1.test.ex [V4NET.0.0.1] MX=5
+  host ten-2.test.ex [V4NET.0.0.2] MX=6
+  host ten-3.test.ex [V4NET.0.0.3] MX=7
+x@mxt14.test.ex
+  router = r2, transport = t1
+  host ten-5-6.test.ex [V4NET.0.0.5] MX=4
+  host ten-5-6.test.ex [V4NET.0.0.6] MX=4
+x@manualroute
+  router = r1, transport = t1
+  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-2.test.ex [V4NET.0.0.2] 
diff --git a/test/stdout/0371 b/test/stdout/0371
new file mode 100644
index 000000000..4f8c21b98
--- /dev/null
+++ b/test/stdout/0371
@@ -0,0 +1,20 @@
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-mail.test.ex Hello something [V4NET.0.0.0]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+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!
+
+550 <x@y> Unrouteable address
+250 OK
+221 mail.test.ex closing connection
diff --git a/test/stdout/0372 b/test/stdout/0372
new file mode 100644
index 000000000..4d1ea2bd8
--- /dev/null
+++ b/test/stdout/0372
@@ -0,0 +1,10 @@
+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
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0373 b/test/stdout/0373
new file mode 100644
index 000000000..6cb4425eb
--- /dev/null
+++ b/test/stdout/0373
@@ -0,0 +1,63 @@
+> Failed: failed to connect to socket TESTSUITE/test-socket: No such file or directory
+> 2 ++ no socket ++
+> 
+> 1 >>ANSWER-1
+<<
+> 2 >>ANSWER-2<<
+> 3 >>ANSWER-3*EOL*<<
+> 4 >>ANSWER-4*EOL*<<
+> 5 >>ANSWER-5<<
+> 6 >><<
+> 7 >><<
+> Failed: socket read timed out
+> 9 >>sock error<<
+> 
+451 Temporary local problem - please try later
+
+******** SERVER ********
+Listening on TESTSUITE/test-socket ... 
+Connection request
+QUERY-1
+>LF>ANSWER-1
+>*eof
+Listening on TESTSUITE/test-socket ... 
+Connection request
+QUERY-2
+>>ANSWER-2
+>*eof
+Listening on TESTSUITE/test-socket ... 
+Connection request
+QUERY-3
+>LF>ANSWER-3
+>*eof
+Listening on TESTSUITE/test-socket ... 
+Connection request
+QUERY-4
+>LF>ANSWER-4
+>*eof
+Listening on TESTSUITE/test-socket ... 
+Connection request
+>>ANSWER-5
+>*eof
+Listening on TESTSUITE/test-socket ... 
+Connection request
+*sleep 1
+>*eof
+Listening on TESTSUITE/test-socket ... 
+Connection request
+>*eof
+Listening on TESTSUITE/test-socket ... 
+Connection request
+QUERY-8
+*sleep 2
+Expected EOF read from client
+Listening on TESTSUITE/test-socket ... 
+Connection request
+QUERY-9
+*sleep 2
+End of script
+Listening on TESTSUITE/test-socket ... 
+Connection request
+QUERY-ACL
+*sleep 3
+End of script
diff --git a/test/stdout/0374 b/test/stdout/0374
new file mode 100644
index 000000000..f9844eb3b
--- /dev/null
+++ b/test/stdout/0374
@@ -0,0 +1,49 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220
+EHLO myhost.test.ex
+220 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<d1@myhost.test.ex>
+250 OK
+DATA
+334 send more
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220
+EHLO myhost.test.ex
+220 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<d2@myhost.test.ex>
+450 soft error
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220
+EHLO myhost.test.ex
+220 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<d3@myhost.test.ex>
+550 hard error
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0375 b/test/stdout/0375
new file mode 100644
index 000000000..6e0080d5b
--- /dev/null
+++ b/test/stdout/0375
@@ -0,0 +1,108 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220
+EHLO myhost.test.ex
+220 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<d1@myhost.test.ex>
+250 OK
+DATA
+334 send more
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220
+EHLO myhost.test.ex
+220 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<d2@myhost.test.ex>
+450 soft error
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220
+EHLO myhost.test.ex
+220 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<d3@myhost.test.ex>
+550 hard error
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220
+EHLO myhost.test.ex
+220 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<e1@myhost.test.ex>
+550 hard error
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220
+EHLO myhost.test.ex
+220 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<f1@myhost.test.ex>
+250 OK
+DATA
+334 send more
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220
+EHLO myhost.test.ex
+220 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<f2@myhost.test.ex>
+450 soft error
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220
+EHLO myhost.test.ex
+220 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<f3@myhost.test.ex>
+550 hard error
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0376 b/test/stdout/0376
new file mode 100644
index 000000000..342a94ed4
--- /dev/null
+++ b/test/stdout/0376
@@ -0,0 +1,442 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+451 Could not complete sender verify callout
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Verification failed for <bad@localhost>
+550-Called:   127.0.0.1
+550-Sent:     RCPT TO:<bad@localhost>
+550-Response: 550 REJECTED
+550 Sender verify failed
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Verification failed for <bad@localhost>
+550-Previous (cached) callout verification failure
+550 Sender verify failed
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Callback setup failed while verifying <ok@localhost>
+550-Called:   127.0.0.1
+550-Sent:     MAIL FROM:<>
+550-Response: 550 REJECT MAIL FROM
+550-The initial connection, or a HELO or MAIL FROM:<> command was
+550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards
+550-RFC requirements, and stops you from receiving standard bounce
+550-messages. This host does not accept mail from domains whose servers
+550-refuse bounces.
+550 Sender verify failed
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Callback setup failed while verifying <ok@localhost>
+550-(result of an earlier callout reused).
+550-The initial connection, or a HELO or MAIL FROM:<> command was
+550-rejected. Refusing MAIL FROM:<> does not help fight spam, disregards
+550-RFC requirements, and stops you from receiving standard bounce
+550-messages. This host does not accept mail from domains whose servers
+550-refuse bounces.
+550 Sender verify failed
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Postmaster verification failed while checking <ok@otherhost>
+550-Called:   127.0.0.1
+550-Sent:     RCPT TO:<postmaster@otherhost>
+550-Response: 550 NOT OK
+550-Several RFCs state that you are required to have a postmaster
+550-mailbox for each mail domain. This host does not accept mail
+550-from domains whose servers reject the postmaster address.
+550 Sender verify failed
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Postmaster verification failed while checking <ok@otherhost>
+550-(result of earlier verification reused).
+550-Several RFCs state that you are required to have a postmaster
+550-mailbox for each mail domain. This host does not accept mail
+550-from domains whose servers reject the postmaster address.
+550 Sender verify failed
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+451 Could not complete sender verify callout
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+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 myhost.test.ex closing connection
+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
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<ok@localhost>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<bad@localhost>
+550 REJECTED
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+550 REJECT MAIL FROM
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<ok@otherhost>
+250 OK
+RSET
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<postmaster@otherhost>
+550 NOT OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<ok@otherhost2>
+250 OK
+RSET
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<postmaster@otherhost2>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost3>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost4>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost41>
+550 NOT OK
+RSET
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<ok@otherhost41>
+250 OK
+RSET
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<postmaster@otherhost41>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<ok@otherhost21>
+250 OK
+RSET
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<postmaster@otherhost21>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<ok2@otherhost21>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost31>
+550 NOT OK
+RSET
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<ok@otherhost31>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<okok@otherhost31>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost31>
+550 NOT OK
+RSET
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<okokok@otherhost31>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+*sleep 2
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<okokok@otherhost52>
+250 OK
+RSET
+250 OK
+MAIL FROM:<pmsend@a.domain>
+250 OK
+RCPT TO:<postmaster@otherhost52>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<somesender@a.domain>
+250 OK
+RCPT TO:<abcd@x.y.z>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<abcd@x.y.z>
+*sleep 2
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<ok@otherhost9>
+250 OK
+RSET
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<postmaster@otherhost9>
+550 NOT OK
+RCPT TO:<postmaster>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<postmaster@myhost.test.ex>
+250 OK
+RCPT TO:<myhost.test.ex-dddddddd-testing@test.ex>
+550 RANDOM IS BAD
+RSET
+250 OK
+MAIL FROM:<postmaster@myhost.test.ex>
+250 OK
+RCPT TO:<z@test.ex>
+250 OK
+RSET
+250 OK
+MAIL FROM:<pmsend@b.domain>
+250 OK
+RCPT TO:<postmaster@test.ex>
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0377 b/test/stdout/0377
new file mode 100644
index 000000000..140f53b9a
--- /dev/null
+++ b/test/stdout/0377
@@ -0,0 +1,26 @@
+10HmaX-0005vi-00-H
+CALLER UID GID
+<CALLER@myhost.test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local
+-body_linecount 0
+-auth_id CALLER
+-auth_sender CALLER@myhost.test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-local
+YY bbbb@myhost.test.ex/t1
+NN aaaa@myhost.test.ex/t1
+NN cccc@myhost.test.ex/t1
+3
+aaaa@myhost.test.ex
+bbbb@myhost.test.ex
+cccc@myhost.test.ex
+
+dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+dddF From: CALLER_NAME <CALLER@myhost.test.ex>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0378 b/test/stdout/0378
new file mode 100644
index 000000000..bbaa49a14
--- /dev/null
+++ b/test/stdout/0378
@@ -0,0 +1,25 @@
+10HmaX-0005vi-00-H
+CALLER UID GID
+<CALLER@myhost.test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local
+-body_linecount 0
+-auth_id CALLER
+-auth_sender CALLER@myhost.test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-local
+YY >CALLER@myhost.test.ex:aaaa@myhost.test.ex
+NN TESTSUITE/test-mail/file:aaaa@myhost.test.ex
+NN |/bin/sh -c exit:aaaa@myhost.test.ex
+1
+aaaa@myhost.test.ex
+
+dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for aaaa@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+dddF From: CALLER_NAME <CALLER@myhost.test.ex>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0379 b/test/stdout/0379
new file mode 100644
index 000000000..00857b734
--- /dev/null
+++ b/test/stdout/0379
@@ -0,0 +1,25 @@
+10HmaX-0005vi-00-H
+CALLER UID GID
+<CALLER@myhost.test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local
+-body_linecount 0
+-auth_id CALLER
+-auth_sender CALLER@myhost.test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-local
+YY bbbb@myhost.test.ex
+NN aaaa@myhost.test.ex
+NN cccc@myhost.test.ex
+2
+defer@myhost.test.ex
+aaaa@myhost.test.ex
+
+dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+dddF From: CALLER_NAME <CALLER@myhost.test.ex>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0381 b/test/stdout/0381
new file mode 100644
index 000000000..057562f13
--- /dev/null
+++ b/test/stdout/0381
@@ -0,0 +1,4 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0384 b/test/stdout/0384
new file mode 100644
index 000000000..9979054d8
--- /dev/null
+++ b/test/stdout/0384
@@ -0,0 +1,14 @@
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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-myhost.test.ex Hello [V4NET.9.8.7] [V4NET.9.8.7]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+550 EHLO argument does not match calling host
+250 Accepted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0386 b/test/stdout/0386
new file mode 100644
index 000000000..7ee79fd62
--- /dev/null
+++ b/test/stdout/0386
@@ -0,0 +1,23 @@
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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 No such user here
+250 Reset OK
+250 OK
+550 No such user here
+221 myhost.test.ex closing connection
+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
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0387 b/test/stdout/0387
new file mode 100644
index 000000000..9129f0100
--- /dev/null
+++ b/test/stdout/0387
@@ -0,0 +1,36 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+>  1 [*.b.c]
+>  2 
+>  3 [*]
+>  4 [*.c]
+>  5 [*.c]
+>  6 [*@y.c]
+>  7 [*.b.c]
+>  8 [.b.c]
+>  9 [b.c]
+> 10 [*b.c]
+> 11 [*]
+> 12 [.]
+> 13 [++aa.bb]
+> 14 [++]
+> 15 [*]
+> 16 [*.b.c]||a|b.c
+> 
diff --git a/test/stdout/0388 b/test/stdout/0388
new file mode 100644
index 000000000..ef01ef46c
--- /dev/null
+++ b/test/stdout/0388
@@ -0,0 +1,14 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<x@y>
+451 Temporary error
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0389 b/test/stdout/0389
new file mode 100644
index 000000000..b361850cf
--- /dev/null
+++ b/test/stdout/0389
@@ -0,0 +1,31 @@
+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 myhost.test.ex closing connection
+10HmaX-0005vi-00-H
+CALLER UID GID
+<CALLER@myhost.test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local-smtp
+-aclm 0 22
+>Sender verify failed<
+-body_linecount 0
+-auth_id CALLER
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-deliver_firsttime
+-local
+XX
+1
+x@y
+
+dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+dddF From: CALLER_NAME <CALLER@myhost.test.ex>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0390 b/test/stdout/0390
new file mode 100644
index 000000000..c33eb534c
--- /dev/null
+++ b/test/stdout/0390
@@ -0,0 +1,142 @@
+no_accept_8bitmime
+acl_not_smtp = xxx
+acl_smtp_auth = 
+acl_smtp_connect = 
+acl_smtp_data = xxx
+acl_smtp_etrn = yyy
+acl_smtp_expn = zzz
+acl_smtp_mail = yyy
+acl_smtp_rcpt = 
+acl_smtp_vrfy = 
+accept_8bitmime
+acl_not_smtp = 
+acl_smtp_auth = xxx
+acl_smtp_connect = xxx
+acl_smtp_data = yyy
+acl_smtp_etrn = xxx
+acl_smtp_expn = 
+acl_smtp_mail = xxx
+acl_smtp_rcpt = 
+acl_smtp_vrfy = 
+no_accept_8bitmime
+acl_not_smtp = xxx
+acl_smtp_auth = xxx
+acl_smtp_connect = yyy
+acl_smtp_data = xxx
+acl_smtp_etrn = yyy
+acl_smtp_expn = yyy
+acl_smtp_mail = yyy
+acl_smtp_rcpt = 
+acl_smtp_vrfy = 
+accept_8bitmime
+acl_not_smtp = 
+acl_smtp_auth = xxx
+acl_smtp_connect = xxx
+acl_smtp_data = 
+acl_smtp_etrn = xxx
+acl_smtp_expn = xxx
+acl_smtp_mail = xxx
+acl_smtp_rcpt = 
+acl_smtp_vrfy = 
+no_body_only
+current_directory = 
+debug_print = 
+no_delivery_date_add
+no_disable_logging
+driver = pipe
+no_envelope_to_add
+group = 
+headers_add = 
+no_headers_only
+headers_remove = 
+headers_rewrite = 
+home_directory = 
+no_initgroups
+message_size_limit = 
+no_rcpt_include_affixes
+retry_use_local_part
+return_path = 
+no_return_path_add
+shadow_condition = 
+shadow_transport = 
+transport_filter = 
+transport_filter_timeout = 5m
+user = 
+allow_commands = 
+batch_id = 
+batch_max = 20
+check_string = 
+command = /x/y
+environment = 
+escape_string = 
+no_freeze_exec_fail
+no_ignore_status
+no_log_defer_output
+no_log_fail_output
+no_log_output
+max_output = 20K
+message_prefix = From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n
+message_suffix = \n
+path = /bin:/usr/bin
+no_pipe_as_creator
+no_restrict_to_path
+no_return_fail_output
+no_return_output
+temp_errors = 75:73
+timeout = 1h
+no_timeout_defer
+umask = 022
+no_use_bsmtp
+no_use_crlf
+no_use_shell
+no_body_only
+current_directory = 
+debug_print = 
+no_delivery_date_add
+no_disable_logging
+driver = pipe
+no_envelope_to_add
+group = 
+headers_add = 
+no_headers_only
+headers_remove = 
+headers_rewrite = 
+home_directory = 
+no_initgroups
+message_size_limit = 
+no_rcpt_include_affixes
+retry_use_local_part
+return_path = 
+no_return_path_add
+shadow_condition = 
+shadow_transport = 
+transport_filter = 
+transport_filter_timeout = 5m
+user = 
+allow_commands = 
+batch_id = 
+batch_max = 10
+check_string = 
+command = /x/y
+environment = 
+escape_string = 
+no_freeze_exec_fail
+no_ignore_status
+no_log_defer_output
+no_log_fail_output
+no_log_output
+max_output = 20K
+message_prefix = From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n
+message_suffix = \n
+path = /bin:/usr/bin
+no_pipe_as_creator
+no_restrict_to_path
+no_return_fail_output
+no_return_output
+temp_errors = 75:73
+timeout = 1h
+no_timeout_defer
+umask = 022
+no_use_bsmtp
+no_use_crlf
+no_use_shell
diff --git a/test/stdout/0391 b/test/stdout/0391
new file mode 100644
index 000000000..5ccb71fe5
--- /dev/null
+++ b/test/stdout/0391
@@ -0,0 +1,9 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0392 b/test/stdout/0392
new file mode 100644
index 000000000..95f28d6db
--- /dev/null
+++ b/test/stdout/0392
@@ -0,0 +1,4 @@
+x@y
+  router = r2, transport = t2
+x@y
+  router = r1, transport = t1
diff --git a/test/stdout/0394 b/test/stdout/0394
new file mode 100644
index 000000000..8e82308c1
--- /dev/null
+++ b/test/stdout/0394
@@ -0,0 +1,30 @@
+
+**** SMTP testing session as if from host V4NET.255.255.255
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+550 Administrative prohibition
+
+**** SMTP testing session as if from host V4NET.255.255.255
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+451 Temporary local problem - please try later
+
+**** SMTP testing session as if from host V4NET.255.255.255
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+451 Temporary local problem - please try later
+
+**** SMTP testing session as if from host V4NET.255.255.255
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+451 Temporary local problem - please try later
+
+**** SMTP testing session as if from host V4NET.255.255.255
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+451 Temporary local problem - please try later
diff --git a/test/stdout/0395 b/test/stdout/0395
new file mode 100644
index 000000000..03eedb7cf
--- /dev/null
+++ b/test/stdout/0395
@@ -0,0 +1,28 @@
+501 sender address must contain a domain
+Transaction started in line 0
+Error detected in line 1
+mail from: userx
+501 recipient address must contain a domain
+Transaction started in line 0
+Error detected in line 2
+rcpt to: userx
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+501 userx: recipient address must contain a domain
+503 valid RCPT command must precede DATA
+500 unrecognized command
+500 unrecognized command
+500 unrecognized command
+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
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbE-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
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbF-0005vi-00
+221 the.local.host.name closing connection
diff --git a/test/stdout/0396 b/test/stdout/0396
new file mode 100644
index 000000000..cb913473d
--- /dev/null
+++ b/test/stdout/0396
@@ -0,0 +1,4 @@
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550 Administrative prohibition
+221 the.local.host.name closing connection
diff --git a/test/stdout/0398 b/test/stdout/0398
new file mode 100644
index 000000000..f65d493b4
--- /dev/null
+++ b/test/stdout/0398
@@ -0,0 +1,62 @@
+220 mail.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 mail.test.ex closing connection
+220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Verification failed for <z@remote>
+550-Called:   127.0.0.1
+550-Sent:     RCPT TO:<z@remote>
+550-Response: 550 Unknown
+550 Sender verify failed
+221 mail.test.ex closing connection
+220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+250 Accepted
+221 mail.test.ex closing connection
+220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+250 Accepted
+221 mail.test.ex closing connection
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO mail.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<x@remote>
+550 Unknown
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO mail.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<z@remote>
+550 Unknown
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO mail.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<qq@remote>
+550 Unknown
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0399 b/test/stdout/0399
new file mode 100644
index 000000000..ef426f34e
--- /dev/null
+++ b/test/stdout/0399
@@ -0,0 +1,2 @@
+x@y cannot be resolved at this time:
+  failed to expand "more" in r3 router: unknown variable name "unknown_variable"
diff --git a/test/stdout/0400 b/test/stdout/0400
new file mode 100644
index 000000000..0e7bd6075
--- /dev/null
+++ b/test/stdout/0400
@@ -0,0 +1,15 @@
+abcd@test.ex
+    <-- t1@d1
+  router = r3, transport = t1
+abcd@d1
+    <-- t1@d1
+  router = r3, transport = t1
+\abcd@test.ex
+    <-- t1@d1
+  router = r3, transport = t1
+spqr@d2
+    <-- alias1@d2
+  router = r3, transport = t1
+spqr@test.ex
+    <-- alias2@d2
+  router = r3, transport = t1
diff --git a/test/stdout/0401 b/test/stdout/0401
new file mode 100644
index 000000000..39c5cbcf8
--- /dev/null
+++ b/test/stdout/0401
@@ -0,0 +1,15 @@
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 mail.test.ex Hello xxx [V4NET.9.8.7]
+550 Administrative prohibition
+221 mail.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.9.9.9
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+550 Administrative prohibition
diff --git a/test/stdout/0405 b/test/stdout/0405
new file mode 100644
index 000000000..6b561f74f
--- /dev/null
+++ b/test/stdout/0405
@@ -0,0 +1,4 @@
+syntax error: domain missing or malformed
+bounce@π.test.ex
+  router = r1, transport = t1
+  host mx.π.test.ex [V4NET.255.255.255] MX=0
diff --git a/test/stdout/0406 b/test/stdout/0406
new file mode 100644
index 000000000..9ce3f6d43
--- /dev/null
+++ b/test/stdout/0406
@@ -0,0 +1,71 @@
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0406.f"
+
+Testprint: subject = >lots of leading and trailing space<
+Testprint: raw subject = >       lots of leading and trailing space         \n<
+Testprint: to = >a@b,\nc@d<
+Testprint: raw to = >    a@b\n    c@d\n<
+Testprint: rX-1: > (=?ISO-8859-1?Q?a?=)\n<
+Testprint: bX-1: >(a)<
+Testprint:  X-1: >(a)<
+Testprint: rX-2: > (=?ISO-8859-1?Q?a?= b)\n<
+Testprint: bX-2: >(a b)<
+Testprint:  X-2: >(a b)<
+Testprint: rX-3: > (=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=)\n<
+Testprint: bX-3: >(ab)<
+Testprint:  X-3: >(ab)<
+Testprint: rX-4: > (=?ISO-8859-1?Q?a?=  =?ISO-8859-1?Q?b?=)\n<
+Testprint: bX-4: >(ab)<
+Testprint:  X-4: >(ab)<
+Testprint: rX-5: > (=?ISO-8859-1?Q?a?=  \n     =?ISO-8859-1?Q?b?=)\n<
+Testprint: bX-5: >(ab)<
+Testprint:  X-5: >(ab)<
+Testprint: rX-6: > (=?ISO-8859-1?Q?a_b?=)\n<
+Testprint: bX-6: >(a b)<
+Testprint:  X-6: >(a b)<
+Testprint: rX-7: > (=?ISO-8859-1?Q?a?= =?ISO-8859-2?Q?_b?=)\n<
+Testprint: bX-7: >(a b)<
+Testprint:  X-7: >(a b)<
+Testprint: rX-8: > (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)\n<
+Testprint: bX-8: >(\355\345\354\371 \357\341 \351\354\350\364\360)<
+Testprint:  X-8: >(\355\345\354\371 \357\341 \351\354\350\364\360)<
+Testprint: rX-9: > =?ISO-8859-1?Q?Patrik_F=E4ltstr=F6m?= <xxx>\n<
+Testprint: bX-9: >Patrik F\344ltstr\366m <xxx><
+Testprint:  X-9: >Patrik F\344ltstr\366m <xxx><
+Testprint: rX-10: > =?US-ASCII?Q?Keith_Moore?= <xxx>\n<
+Testprint: bX-10: >Keith Moore <xxx><
+Testprint:  X-10: >Keith Moore <xxx><
+Testprint: rX-11: > =?ISO-8859-1?Q?Keld_J=F8rn_Simonsen?= <xxx>\n<
+Testprint: bX-11: >Keld J\370rn Simonsen <xxx><
+Testprint:  X-11: >Keld J\370rn Simonsen <xxx><
+Testprint: rX-12: > =?ISO-8859-1?Q?Andr=E9?= Pirard <xxx>\n<
+Testprint: bX-12: >Andr\351 Pirard <xxx><
+Testprint:  X-12: >Andr\351 Pirard <xxx><
+Testprint: rX-13: > =?ISO-8859-1?B?SWYgeW91IGNhbiByZWFkIHRoaXMgeW8=?=\n =?ISO-8859-2?B?dSB1bmRlcnN0YW5kIHRoZSBleGFtcGxlLg==?=\n<
+Testprint: bX-13: >If you can read this you understand the example.<
+Testprint:  X-13: >If you can read this you understand the example.<
+Testprint: rX-14: > =?ISO-8859-1?Q?X=00Y?=      \n<
+Testprint: bX-14: >X?Y<
+Testprint:  X-14: >X?Y<
+Testprint: rX-15: > =?iso-8859-3?Q?=?= =?US-ASCII?Q?ABCD?= Text\n<
+Testprint: bX-15: >=?iso-8859-3?Q?=?= ABCD Text<
+Testprint:  X-15: >=?iso-8859-3?Q?=?= ABCD Text<
+Testprint: rX-16: > =?iso-8859-3?B?+2?= =?UTF-8?Q?ABCD?= Text\n<
+Testprint: bX-16: >=?iso-8859-3?B?+2?= ABCD Text<
+Testprint:  X-16: >=?iso-8859-3?B?+2?= ABCD Text<
+Testprint: rX-17: > =?UTF-8?Q?xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx?=\n<
+Testprint: bX-17: >xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx<
+Testprint:  X-17: >xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx<
+Testprint: rX-18: > =?UTF-8?Q?xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx?=\n<
+Testprint: bX-18: >=?UTF-8?Q?xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx?=<
+Testprint:  X-18: >=?UTF-8?Q?xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx?=<
+Testprint: rX-19: > =?iso-8859-3?B?=?= =?UTF-8?Q?ABCD?= Text\n<
+Testprint: bX-19: >=?iso-8859-3?B?=?= ABCD Text<
+Testprint:  X-19: >=?iso-8859-3?B?=?= ABCD Text<
+Testprint: rX-20: > =?iso-8859-1?Q?a?= =?ISO-8859-1?Q?x y?= bad because of space\n<
+Testprint: bX-20: >a =?ISO-8859-1?Q?x y?= bad because of space<
+Testprint:  X-20: >a =?ISO-8859-1?Q?x y?= bad because of space<
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
diff --git a/test/stdout/0407 b/test/stdout/0407
new file mode 100644
index 000000000..aeedbf5bc
--- /dev/null
+++ b/test/stdout/0407
@@ -0,0 +1,6 @@
+220 mail.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
+552 A message header line is too long
+221 mail.test.ex closing connection
diff --git a/test/stdout/0409 b/test/stdout/0409
new file mode 100644
index 000000000..4787819a1
--- /dev/null
+++ b/test/stdout/0409
@@ -0,0 +1,4 @@
+220 
+221 mail.test.ex closing connection
+220 test.ex XYZ
+221 mail.test.ex closing connection
diff --git a/test/stdout/0410 b/test/stdout/0410
new file mode 100644
index 000000000..c37b4ac90
--- /dev/null
+++ b/test/stdout/0410
@@ -0,0 +1,5 @@
+220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+250 Accepted
+221 mail.test.ex closing connection
diff --git a/test/stdout/0413 b/test/stdout/0413
new file mode 100644
index 000000000..18da4529a
--- /dev/null
+++ b/test/stdout/0413
@@ -0,0 +1,45 @@
+220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+451 Could not complete sender verify callout
+250 Reset OK
+451 Could not complete sender verify callout
+250 Reset OK
+451 Could not complete sender verify callout
+221 mail.test.ex closing connection
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO mail.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<r1@domain1>
+450 Temporary error
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [ip4.ip4.ip4.ip4]
+220 Server ready
+HELO mail.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<r2@domain2>
+450 Temporary error
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO mail.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<r3@domain3>
+450 Temporary error
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0414 b/test/stdout/0414
new file mode 100644
index 000000000..23b250fcb
--- /dev/null
+++ b/test/stdout/0414
@@ -0,0 +1,4 @@
+x@b.domain
+  router = r2, transport = t1
+x@a.domain
+  router = r3, transport = t1
diff --git a/test/stdout/0415 b/test/stdout/0415
new file mode 100644
index 000000000..f1183c838
--- /dev/null
+++ b/test/stdout/0415
@@ -0,0 +1,3 @@
+finduser_retries = 0
+finduser_retries = 999999999
+finduser_retries = 1023998976
diff --git a/test/stdout/0416 b/test/stdout/0416
new file mode 100644
index 000000000..0d359cbc7
--- /dev/null
+++ b/test/stdout/0416
@@ -0,0 +1,28 @@
+220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+451 Temporary local problem - please try later
+421 mail.test.ex lost input connection
+220 mail.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=10HmaY-0005vi-00
+250 OK
+250 Accepted
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbA-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbB-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+221 mail.test.ex closing connection
diff --git a/test/stdout/0417 b/test/stdout/0417
new file mode 100644
index 000000000..c0aaa28a9
--- /dev/null
+++ b/test/stdout/0417
@@ -0,0 +1,12 @@
+220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+451 Temporary local problem - please try later
+451 Temporary local problem - please try later
+221 mail.test.ex closing connection
+220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+451-host lookup did not complete
+451 Could not complete sender verify
+451-host lookup did not complete
+451 Could not complete sender verify
+221 mail.test.ex closing connection
diff --git a/test/stdout/0418 b/test/stdout/0418
new file mode 100644
index 000000000..b108c99cc
--- /dev/null
+++ b/test/stdout/0418
@@ -0,0 +1,5 @@
+220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-This is a message which is continued over several lines, with an
+550 interspersed comment
+221 mail.test.ex closing connection
diff --git a/test/stdout/0419 b/test/stdout/0419
new file mode 100644
index 000000000..0d7d734d1
--- /dev/null
+++ b/test/stdout/0419
@@ -0,0 +1,3 @@
+k@mxt13.test.ex
+  router = dnslookup, transport = smtp
+  host other1.test.ex [V4NET.12.4.5] MX=4
diff --git a/test/stdout/0420 b/test/stdout/0420
new file mode 100644
index 000000000..56c57b692
--- /dev/null
+++ b/test/stdout/0420
@@ -0,0 +1,21 @@
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 mail.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!
+
+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 mail.test.ex closing connection
diff --git a/test/stdout/0422 b/test/stdout/0422
new file mode 100644
index 000000000..2956fb600
--- /dev/null
+++ b/test/stdout/0422
@@ -0,0 +1,13 @@
+
+**** SMTP testing session as if from host V4NET.13.13.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+221 mail.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.13.13.2
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+550 dnslist_value is 127.0.0.1, 127.0.0.2
diff --git a/test/stdout/0423 b/test/stdout/0423
new file mode 100644
index 000000000..e98ada7f0
--- /dev/null
+++ b/test/stdout/0423
@@ -0,0 +1,10 @@
+
+**** SMTP testing session as if from host V4NET.13.13.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+550-xxxxxxxxxxxxxx has refused this message because it looks like it is
+550-infected with the Sobig.E worm. See http://www.xxxx.xxx/xxxxxxxx/xxxx/xxxx/w32.sobig.e@xx.html
+550-for details. If you feel this determination is in error, please forward the
+550-entire message to postmaster@xxxxxxxxxxxxx.com and include code "xx#1" in
+550 the Subject
diff --git a/test/stdout/0424 b/test/stdout/0424
new file mode 100644
index 000000000..708fa8f69
--- /dev/null
+++ b/test/stdout/0424
@@ -0,0 +1,2 @@
+userx@test.ex is undeliverable:
+  Return_path is: <CALLER@test.ex>
diff --git a/test/stdout/0425 b/test/stdout/0425
new file mode 100644
index 000000000..c37b4ac90
--- /dev/null
+++ b/test/stdout/0425
@@ -0,0 +1,5 @@
+220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+250 Accepted
+221 mail.test.ex closing connection
diff --git a/test/stdout/0426 b/test/stdout/0426
new file mode 100644
index 000000000..2c9f17959
--- /dev/null
+++ b/test/stdout/0426
@@ -0,0 +1,14 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO mail.test.ex
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<x@UpperCase.test.ex>
+550 Unknown
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0427 b/test/stdout/0427
new file mode 100644
index 000000000..fae204996
--- /dev/null
+++ b/test/stdout/0427
@@ -0,0 +1,452 @@
+==========
+# Sieve filter
+if address ["From","To"] "marian@abcdefgh.example"
+        { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if address :is "From" "marian@abcdefgh.example"
+        { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if address :is "To" "marian@abcdefgh.example"
+        { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if address :contains "To" "abcdefgh"
+        { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if address :matches "To" "*abc?efgh*"
+        { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if true { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if false { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if allof (false,false) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if allof (true,false) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if allof (false,true) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if allof (true,true) { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if anyof (false,false) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if anyof (true,false) { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if anyof (false,true) { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if anyof (true,true) { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not anyof (false,false) { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not anyof (true,false) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if not anyof (false,true) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if not anyof (true,true) { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header "to" "MARIAN@abcdefgh.example" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :comparator "i;octet" "to" "MARIAN@abcdefgh.example" { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header :comparator "i;ascii-casemap" "to" "MARIAN@abcdefgh.example" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+require "envelope";
+if envelope "from" "marian@somenet.example" { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+require "envelope";
+if envelope "from" "offerqn@bpk.example.com" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if exists [ "X-NotHere", "X-Notheretoo" ] { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if exists [ "X-NotHere", "Delivered-To" ] { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if exists [ "From", "Delivered-To" ] { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :contains "X-NotHere" "" { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header "Delivered-To" "" { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header :contains "Delivered-To" "" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :contains "Delivered-To" "rc@irc.somenet.example" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "Delivered-To" ["irc@irc.somenet.example"] { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header "Delivered-To" ["irc@irc.somenet.example","irc@01019somenet.example","some.one"] { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header "Mime-Version" "1.0" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if false { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if true { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if true { discard; } else { keep; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if false { keep; } else { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if false { keep; } elsif true { discard; } else { keep; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if true { discard; } elsif true { keep; } else { keep; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if false { keep; }
+	else
+	{ if true { discard; } else { keep; } }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :matches "to" "MA*AN@abc*fg?.example" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not header :matches "to" "MA?AN@abc*fg?.example" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :matches "to" "*marian@abcdefgh.example" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not header :matches "to" "?marian@abcdefgh.example" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :matches "to" "marian@abcdefgh.example*" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not header :matches "to" "marian@abcdefgh.example?" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :matches "x-special1" "\\?*\\*" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header :matches "x-special1" "*\0*" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not header :matches "x-special1" "*\0*q" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not header :matches "x-special2" "\\?*\\*" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not header :matches "x-special2" "*\0*" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if size :over 400 {
+            discard;
+            }
+==========
+No implicit keep
+==========
+# Sieve filter
+if size :over 4K {
+            discard;
+            }
+==========
+Implicit keep
+==========
+# Sieve filter
+if size :under 4K { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if size :under 400 { discard; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if false { keep; }
+==========
+Implicit keep
+==========
+# no filter line here
+if unknowntest { keep; }
+==========
+Testing forward file file "test-data"
+
+exim: error in forward file: missing or malformed local part (expected word or "<") in "if unknowntest { keep; }"
+==========
+# Sieve filter
+if test keep; }
+==========
+Sieve error: missing test in line 2
+==========
+# Sieve filter
+if test { keep;
+==========
+Sieve error: missing test in line 2
+==========
+# Sieve filter
+if true { unknownaction; }
+==========
+Sieve error: expecting command or closing brace in line 2
+==========
+# Sieve filter
+if true { fileinto abcdefgh; }
+==========
+Sieve error: missing previous require "fileinto"; in line 2
+==========
+# Sieve filter
+require "fileinto";
+if true { fileinto "abcdefgh"; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header ["to"] [ "marian@abcdefgh.example", "achnee"] { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "to" [ "egal", "achnee" { keep; }
+==========
+Sieve error: missing string list in line 2
+==========
+# Sieve filter
+if header "to","from"] "egal" { keep; }
+==========
+Sieve error: key string list expected in line 2
+==========
+# Sieve filter
+if header ["to","from" "egal" { keep; }
+==========
+Sieve error: missing string list in line 2
+==========
+# Sieve filter
+if header ["to",,"from"] "egal" { keep; }
+==========
+Sieve error: missing string list in line 2
+==========
+# Sieve filter
+if header ["to",] "egal" { keep; }
+==========
+Sieve error: missing string list in line 2
+==========
+# Sieve filter
+if header [,"to"] "egal" { keep; }
+==========
+Sieve error: missing string list in line 2
+==========
+# Sieve filter
+if unknowntest { keep; }
+==========
+Sieve error: missing test in line 2
+==========
+# Sieve filter
+if header :matches "to" "egal" { keep; }
+==========
+Implicit keep
+==========
+# Sieve filter
+if header :unknown "to" "egal" { keep; }
+==========
+Sieve error: header string list expected in line 2
+==========
+# Sieve filter
+#
+require ["fileinto", "envelope"];
+
+if header :matches "X-Warning" "* is listed at list.dsbl.org*"
+            {
+            keep;               # keep in "In" folder
+            }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-1" "1" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if not header "x-1" "=?ISO-8859-1?Q?=31?=" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-1b" "=?ISO-8859-1?Q?=31=" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-b64" "This is BASE64" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-b64-broken" "=?iso-8859-1?b?VGhpcyBpcyBCQVNFNjQ?=" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-q75total" "0123456789012345678901234567890123456789012345678901234567" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-q76total" "=?ISO-8859-1?Q?01234567890123456789012345678901234567890123456789012345678?=" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "X-Wrapped" "eins zwei drei" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-nomimewrap" "=?iso-8859-1?q?abc def ghi?=" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "subject" "abcdefghi" { discard; }
+==========
+No implicit keep
+==========
+# Sieve filter
+if header "x-mixed" "abc def" { discard; }
+==========
+No implicit keep
+==========
+#Sieve filter
+if true { stop; fileinto "inbox.never"; }
+==========
+Implicit keep
diff --git a/test/stdout/0429 b/test/stdout/0429
new file mode 100644
index 000000000..770817c93
--- /dev/null
+++ b/test/stdout/0429
@@ -0,0 +1,10 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+550 No
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0430 b/test/stdout/0430
new file mode 100644
index 000000000..19713dbd6
--- /dev/null
+++ b/test/stdout/0430
@@ -0,0 +1,60 @@
+x@manual.route
+  router = r1, transport = t1
+  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+x@manual.route
+  router = r1, transport = t1
+  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-6.test.ex [V4NET.0.0.6] 
+x@manual.route
+  router = r1, transport = t1
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-6.test.ex [V4NET.0.0.6] 
+x@random.manual.route
+  router = r2, transport = t1
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+x@random.manual.route
+  router = r2, transport = t1
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-1.test.ex [V4NET.0.0.1] 
+x@random.manual.route
+  router = r2, transport = t1
+  host ten-6.test.ex [V4NET.0.0.6] 
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-1.test.ex [V4NET.0.0.1] 
+y@random.manual.route
+  router = r2, transport = t1
+  host ten-6.test.ex [V4NET.0.0.6] 
+  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+x@random.manual.route
+  router = r2, transport = t1
+  host ten-6.test.ex [V4NET.0.0.6] 
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
+x@manual.route
+  router = r1, transport = t1
+  host ten-1.test.ex [V4NET.0.0.1] 
+x@manual.route cannot be resolved at this time:
+  lowest numbered MX record points to local host
+x@manual.route
+  router = r1, transport = t1
+  host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5
+  host ten-1.test.ex [V4NET.0.0.1] MX=5
+  host ten-6.test.ex [V4NET.0.0.6]      
+x@manual.route is undeliverable:
+  lowest numbered MX record points to local host
+x@random.manual.route cannot be resolved at this time:
+  lookup of host "localhost.test.ex" failed in r2 router
+x@random.manual.route
+  router = r2, transport = t1
+  host ten-6.test.ex [V4NET.0.0.6] 
+  host ten-1.test.ex [V4NET.0.0.1] MX=6
diff --git a/test/stdout/0431 b/test/stdout/0431
new file mode 100644
index 000000000..5e17ec9d6
--- /dev/null
+++ b/test/stdout/0431
@@ -0,0 +1,52 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<xxx@a.b>
+250 OK
+RCPT TO:<xxx@a.b>
+250 OK
+DATA
+354 Go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+220 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<pre-xxx@a.b>
+250 OK
+RCPT TO:<xxx+post@a.b>
+250 OK
+DATA
+354 Go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+220 OK
+End of script
diff --git a/test/stdout/0432 b/test/stdout/0432
new file mode 100644
index 000000000..d6ac41709
--- /dev/null
+++ b/test/stdout/0432
@@ -0,0 +1,81 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+451 Could not complete sender verify callout
+221 myhost.test.ex closing connection
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<x@y>
+250 OK
+QUIT
+220 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<a@b>
+250 OK
+QUIT
+220 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 server ready
+HELO myhost.test.ex
+*sleep 2
+Expected EOF read from client
+End of script
diff --git a/test/stdout/0434 b/test/stdout/0434
new file mode 100644
index 000000000..8805a8c2b
--- /dev/null
+++ b/test/stdout/0434
@@ -0,0 +1,5 @@
+a@b
+  router = r1, transport = t1
+  host 1.2.3.4 [1.2.3.4] 
+a@b cannot be resolved at this time:
+  remote host address is the local host
diff --git a/test/stdout/0435 b/test/stdout/0435
new file mode 100644
index 000000000..2b974e2cf
--- /dev/null
+++ b/test/stdout/0435
@@ -0,0 +1,3 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+501 NULL characters are not allowed in SMTP commands
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0439 b/test/stdout/0439
new file mode 100644
index 000000000..156a04584
--- /dev/null
+++ b/test/stdout/0439
@@ -0,0 +1,9 @@
+421 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 421
+<<< 421 Temporary local problem - please try later
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/0440 b/test/stdout/0440
new file mode 100644
index 000000000..7433e27b4
--- /dev/null
+++ b/test/stdout/0440
@@ -0,0 +1,61 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 server ready
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<x1@y1>
+250 OK
+DATA
+354 OK
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for x1@y1; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+First message
+.
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<x3@y3>
+250 OK
+DATA
+354 OK
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaZ-0005vi-00
+	for x3@y3; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Third message
+.
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<x2@y2>
+250 OK
+DATA
+354 OK
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaY-0005vi-00
+	for x2@y2; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Second message
+.
+250 OK
+QUIT
+221 OK
+End of script
diff --git a/test/stdout/0442 b/test/stdout/0442
new file mode 100644
index 000000000..1c032698a
--- /dev/null
+++ b/test/stdout/0442
@@ -0,0 +1,45 @@
+
+r1 router:
+address_data = 
+address_test
+cannot_route_message = 
+no_caseful_local_part
+no_check_local_user
+condition = 
+debug_print = 
+no_disable_logging
+domains = 
+driver = accept
+errors_to = 
+expn
+no_fail_verify_recipient
+no_fail_verify_sender
+fallback_hosts = 
+group = 
+headers_add = 
+headers_remove = 
+ignore_target_hosts = 
+no_initgroups
+local_part_prefix = 
+no_local_part_prefix_optional
+local_part_suffix = 
+no_local_part_suffix_optional
+local_parts = 
+log_as_local
+more
+no_pass_on_timeout
+pass_router = 
+redirect_router = 
+require_files = 
+no_retry_use_local_part
+router_home_directory = 
+self = freeze
+senders = 
+transport = t1
+transport_current_directory = 
+transport_home_directory = 
+no_unseen
+user = 
+no_verify_only
+verify_recipient
+verify_sender
diff --git a/test/stdout/0443 b/test/stdout/0443
new file mode 100644
index 000000000..81decfbb2
--- /dev/null
+++ b/test/stdout/0443
@@ -0,0 +1,9 @@
+
+**** SMTP testing session as if from host V4NET.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
+451 Could not complete sender verify callout
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0445 b/test/stdout/0445
new file mode 100644
index 000000000..bf535813c
--- /dev/null
+++ b/test/stdout/0445
@@ -0,0 +1,15 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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 <lp1@x.y>
+550 Sender verify failed
+250 Reset OK
+250 OK
+550-Verification failed for <lp2@x.y>
+550-This is a message
+550 Sender verify failed
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0446 b/test/stdout/0446
new file mode 100644
index 000000000..4cb5a9207
--- /dev/null
+++ b/test/stdout/0446
@@ -0,0 +1,6 @@
+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
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0447 b/test/stdout/0447
new file mode 100644
index 000000000..a3faf356a
--- /dev/null
+++ b/test/stdout/0447
@@ -0,0 +1,17 @@
+Retry rule: *  auth_failed  F,1d,10m; 
+Retry rule: *  timeout  F,1d,2m; 
+Retry rule: *  timeout_connect  F,1d,1m; 
+Retry rule: *  timeout_A  F,1d,30s; 
+Retry rule: *  timeout_connect_A  F,1d,29s; 
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:1224 dd 321 Connection timed out
+first failed = time last try = time2 next try = time2 + 60
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:1224 dd 321 Connection timed out
+first failed = time last try = time2 next try = time2 + 30
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:1224 dd 321 Connection timed out
+first failed = time last try = time2 next try = time2 + 29
++++++++++++++++++++++++++++
+  R:xx.test.again.dns -1 0 host lookup did not complete
+first failed = time last try = time2 next try = time2 + 180
diff --git a/test/stdout/0448 b/test/stdout/0448
new file mode 100644
index 000000000..3117de824
--- /dev/null
+++ b/test/stdout/0448
@@ -0,0 +1,20 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at x.y.z
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at x.y.z
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0450 b/test/stdout/0450
new file mode 100644
index 000000000..2da7c051e
--- /dev/null
+++ b/test/stdout/0450
@@ -0,0 +1,5 @@
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:1225 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 600
+  T:127.0.0.1:127.0.0.1:1226 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 600
diff --git a/test/stdout/0451 b/test/stdout/0451
new file mode 100644
index 000000000..b85aecaad
--- /dev/null
+++ b/test/stdout/0451
@@ -0,0 +1,12 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at a.b.c.d
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550-Verification failed for <CALLER@test.ex>
+550-custom message
+550 message="Sender verify failed"
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0453 b/test/stdout/0453
new file mode 100644
index 000000000..b4d5604cb
--- /dev/null
+++ b/test/stdout/0453
@@ -0,0 +1,23 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+501 Syntactically invalid HELO argument(s)
+501 Syntactically invalid HELO argument(s)
+501 Syntactically invalid HELO argument(s)
+501 Syntactically invalid HELO argument(s)
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+503 sender already given
+503-sender already given
+503 Too many syntax or protocol errors
+
+**** SMTP testing session as if from host V4NET.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 myhost.test.ex Hello xxxx [V4NET.0.0.1]
+250 OK
+501 <bad syntax@x.y.z>: "@" or "." expected after "bad"
+501 <bad syntax@x.y.z>: "@" or "." expected after "bad"
+501 <bad syntax@x.y.z>: "@" or "." expected after "bad"
+501-<bad syntax@x.y.z>: "@" or "." expected after "bad"
+501 Too many syntax or protocol errors
diff --git a/test/stdout/0454 b/test/stdout/0454
new file mode 100644
index 000000000..46e4d29ca
--- /dev/null
+++ b/test/stdout/0454
@@ -0,0 +1,23 @@
+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 rhu.barb
+??? 250
+<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1]
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test message.
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/0456 b/test/stdout/0456
new file mode 100644
index 000000000..d9c5032ff
--- /dev/null
+++ b/test/stdout/0456
@@ -0,0 +1,3 @@
+postmaster@localhost
+    <-- test-bus-error@localhost
+  router = accept, transport = t1
diff --git a/test/stdout/0457 b/test/stdout/0457
new file mode 100644
index 000000000..e5ba09db4
--- /dev/null
+++ b/test/stdout/0457
@@ -0,0 +1,4 @@
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+550 testing deny
+550 testing deny
+221 the.local.host.name closing connection
diff --git a/test/stdout/0458 b/test/stdout/0458
new file mode 100644
index 000000000..b9b54b4db
--- /dev/null
+++ b/test/stdout/0458
@@ -0,0 +1,166 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> DATA
+??? 503
+<<< 503 valid RCPT command must precede DATA
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+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 rhu.barb
+??? 250
+<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1]
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> DATA
+??? 503
+<<< 503 valid RCPT command must precede DATA
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<deny@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> rcpt to:<userx@test.ex>
+??? 503
+<<< 503 sender not yet given
+>>> DATA
+??? 503
+<<< 503 valid RCPT command must precede DATA
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+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 rhu.barb
+??? 250
+<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1]
+>>> mail from:<deny@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> rcpt to:<userx@test.ex>
+??? 503
+<<< 503 sender not yet given
+>>> DATA
+??? 503
+<<< 503 valid RCPT command must precede DATA
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> rcpt to:<ph11@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> rcpt to:<ph12@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> DATA
+??? 503
+<<< 503 valid RCPT command must precede DATA
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+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 rhu.barb
+??? 250
+<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1]
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> rcpt to:<ph11@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> rcpt to:<ph12@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> DATA
+??? 503
+<<< 503 valid RCPT command must precede DATA
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> rcpt to:<userx@test.ex>
+??? 503
+<<< 503 sender not yet given
+>>> DATA
+??? 503
+<<< 503 valid RCPT command must precede DATA
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/0459 b/test/stdout/0459
new file mode 100644
index 000000000..741a7ff1a
--- /dev/null
+++ b/test/stdout/0459
@@ -0,0 +1,4 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0460 b/test/stdout/0460
new file mode 100644
index 000000000..6fece63e7
--- /dev/null
+++ b/test/stdout/0460
@@ -0,0 +1,52 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> From: x@y
+>>> To: some@one
+>>> Subject: contains >\n< bare lf
+>>> Aheader: Another header line
+>>> 
+>>> This is the message body.
+>>> .
+??? 2
+<<< 250 OK id=10HmaX-0005vi-00
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> From: x@y\nBheader: some text
+>>> To: some@one
+>>> Subject: contains >\n< bare lf
+>>> Aheader: Another header line
+>>> 
+>>> This is the message body.
+>>> .
+??? 2
+<<< 250 OK id=10HmaY-0005vi-00
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/0461 b/test/stdout/0461
new file mode 100644
index 000000000..16c0f34e6
--- /dev/null
+++ b/test/stdout/0461
@@ -0,0 +1,77 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 server ready
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@test.ex>
+250 OK
+DATA
+354 OK
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Short message
+.
+250 OK
+QUIT
+221 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 server ready
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@test.ex>
+250 OK
+DATA
+354 OK
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaY-0005vi-00
+	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Short message
+.
+250 OK
+QUIT
+221 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 server ready
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<CALLER@test.ex>
+250 OK
+RCPT TO:<userx@test.ex>
+250 OK
+DATA
+354 OK
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaZ-0005vi-00
+	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Short message
+.
+250 OK
+QUIT
+221 OK
+End of script
diff --git a/test/stdout/0462 b/test/stdout/0462
new file mode 100644
index 000000000..f454d0c23
--- /dev/null
+++ b/test/stdout/0462
@@ -0,0 +1,52 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Postmaster verification failed while checking <Ok@localhost>
+550-Called:   127.0.0.1
+550-Sent:     RCPT TO:<postmaster@localhost>
+550-Response: 550 NO
+550-Several RFCs state that you are required to have a postmaster
+550-mailbox for each mail domain. This host does not accept mail
+550-from domains whose servers reject the postmaster address.
+550 Sender verify failed
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Verification failed for <NOTok@elsewhere>
+550-Called:   127.0.0.1
+550-Sent:     RCPT TO:<NOTok@elsewhere>
+550-Response: 550 NO
+550 Sender verify failed
+221 myhost.test.ex closing connection
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<Ok@localhost>
+250 OK
+RSET
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<postmaster@localhost>
+550 NO
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<NOTok@elsewhere>
+550 NO
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0463 b/test/stdout/0463
new file mode 100644
index 000000000..1bd1f1fa3
--- /dev/null
+++ b/test/stdout/0463
@@ -0,0 +1,4 @@
+x@ten-1.test.ex
+    <-- x@ten-1
+  router = all, transport = smtp
+  host ten-1.test.ex [V4NET.0.0.1] 
diff --git a/test/stdout/0464 b/test/stdout/0464
new file mode 100644
index 000000000..057562f13
--- /dev/null
+++ b/test/stdout/0464
@@ -0,0 +1,4 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0465 b/test/stdout/0465
new file mode 100644
index 000000000..9dd9847ea
--- /dev/null
+++ b/test/stdout/0465
@@ -0,0 +1,22 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+501 <abc@domain.>: domain missing or malformed
+221 myhost.test.ex closing connection
+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
+221 myhost.test.ex closing connection
+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
+ 0m   sss 10HmaY-0005vi-00 <>
+          abc@domain
+
+ 0m   sss 10HmaZ-0005vi-00 <abc@somewhere>
+          xxx@yyy
+
diff --git a/test/stdout/0466 b/test/stdout/0466
new file mode 100644
index 000000000..517f664e4
--- /dev/null
+++ b/test/stdout/0466
@@ -0,0 +1,3 @@
+x@y
+  router = r1, transport = t1
+  host 127.0.0.1 [127.0.0.1] 
diff --git a/test/stdout/0467 b/test/stdout/0467
new file mode 100644
index 000000000..d9c20263c
--- /dev/null
+++ b/test/stdout/0467
@@ -0,0 +1,48 @@
+x@nosrv.test.ex is undeliverable:
+  Unrouteable address
+x@srv01.test.ex
+  router = r1, transport = t1
+  host ten-1.test.ex [V4NET.0.0.1] MX=0 port=25
+x@mx246.test.ex
+  router = r1, transport = t1
+  host ten-1.test.ex [V4NET.0.0.1] MX=10
+  host v6.test.ex [unknown] MX=10 ** unusable **
+x@srv02.test.ex
+  router = r1, transport = t1
+  host ten-1.test.ex [V4NET.0.0.1] MX=1 port=99
+  host ten-2.test.ex [V4NET.0.0.2] MX=1 port=99
+  host ten-3.test.ex [V4NET.0.0.3] MX=3 port=66
+x@nosmtp.test.ex is undeliverable:
+  an MX or SRV record indicated no SMTP service
+x@srv03.test.ex is undeliverable:
+  Unrouteable address
+x@srv03.test.ex
+  router = r1, transport = t1
+  host ten-4.test.ex [V4NET.0.0.4] MX=0 port=88
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<x@srv27.test.ex>
+250 OK
+DATA
+354 OK
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaZ-0005vi-00
+	for x@srv27.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0468 b/test/stdout/0468
new file mode 100644
index 000000000..2b100570d
--- /dev/null
+++ b/test/stdout/0468
@@ -0,0 +1,12 @@
+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-message body <This is the FIRST message body. > message end <This is the
+550 FIRST message body. >
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550-message body <This is the SECOND message body. > message end <This is the
+550 SECOND message body. >
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0469 b/test/stdout/0469
new file mode 100644
index 000000000..18aef036a
--- /dev/null
+++ b/test/stdout/0469
@@ -0,0 +1,2 @@
+x@mxt1c.test.ex is undeliverable:
+  all relevant MX records point to non-existent hosts
diff --git a/test/stdout/0470 b/test/stdout/0470
new file mode 100644
index 000000000..b9a4b033d
--- /dev/null
+++ b/test/stdout/0470
@@ -0,0 +1,10 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at xxx
+250 OK
+550 Administrative prohibition
+550 Administrative prohibition
+250 Reset OK
+250 OK
+550 Administrative prohibition
+550 Administrative prohibition
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0473 b/test/stdout/0473
new file mode 100644
index 000000000..a558a17e9
--- /dev/null
+++ b/test/stdout/0473
@@ -0,0 +1,220 @@
+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 xxxx
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+550-Callout verification failed:
+550 550 NOTOK
+250 Reset OK
+250 OK
+451 Could not complete recipient verify callout
+250 Reset OK
+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-the.local.host.name Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+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-the.local.host.name Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+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-the.local.host.name Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+550-Callout verification failed:
+550 550 NO
+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-the.local.host.name Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+550 Previous (cached) callout verification failure
+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-the.local.host.name Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+550-Verification failed for <x9@test.ex>
+550-Called:   127.0.0.1
+550-Sent:     RCPT TO:<x9@test.ex>
+550-Response: 550 NO
+550 Sender verify failed
+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-the.local.host.name Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+550-Verification failed for <x9@test.ex>
+550-Previous (cached) callout verification failure
+550 Sender verify failed
+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-the.local.host.name Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+221 the.local.host.name closing connection
++++++++++++++++++++++++++++
+07-Mar-2000 12:21:52 r1@test.ex callout=accept
+07-Mar-2000 12:21:52 r1@test.ex/<postmaster@the.local.host.name> callout=accept
+07-Mar-2000 12:21:52 r1@test.ex/<s1@test.ex> callout=accept
+07-Mar-2000 12:21:52 r1@test.ex/<s2@test.ex> callout=accept
+07-Mar-2000 12:21:52 r9@test.ex/<x9@test.ex> callout=reject
+07-Mar-2000 12:21:52 test.ex callout=accept postmaster=unknown random=unknown
+07-Mar-2000 12:21:52 two.test.ex callout=accept postmaster=unknown random=accept (07-Mar-2000 12:21:52)
+07-Mar-2000 12:21:52 x9@test.ex callout=reject
+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 xxxx
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+451 Could not complete recipient verify callout
+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-the.local.host.name Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+451 Could not complete recipient verify callout
+221 the.local.host.name closing connection
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO the.local.host.name
+250 OK
+MAIL FROM:<s1@test.ex>
+250 OK
+RCPT TO:<r1@test.ex>
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO the.local.host.name
+250 OK
+MAIL FROM:<s2@test.ex>
+250 OK
+RCPT TO:<r1@test.ex>
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO the.local.host.name
+250 OK
+MAIL FROM:<s3@other.ex>
+550 NOTOK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO the.local.host.name
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<r1@test.ex>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO the.local.host.name
+250 OK
+MAIL FROM:<postmaster@the.local.host.name>
+250 OK
+RCPT TO:<r1@test.ex>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 server ready
+HELO the.local.host.name
+250 OK
+MAIL FROM:<x9@test.ex>
+250 OK
+RCPT TO:<r9@test.ex>
+550 NO
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 server ready
+HELO the.local.host.name
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<x9@test.ex>
+550 NO
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO the.local.host.name
+250 OK
+MAIL FROM:<postmaster@the.local.host.name>
+250 OK
+RCPT TO:<the.local.host.name--testing@two.test.ex>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO the.local.host.name
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<r11@two.test.ex>
+*sleep 2
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+*sleep 2
+End of script
diff --git a/test/stdout/0474 b/test/stdout/0474
new file mode 100644
index 000000000..cd9c9c281
--- /dev/null
+++ b/test/stdout/0474
@@ -0,0 +1,58 @@
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 850 NONSENSE
+first failed = time last try = time2 next try = time2 + 10
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
+first failed = time last try = time2 next try = time2 + 10
++++++++++++++++++++++++++++
+  R:abcd@xyz -44 12865 SMTP error from remote mail server after RCPT TO:<abcd@xyz>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
+first failed = time last try = time2 next try = time2 + 10
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO the.local.host.name
+250 OK
+MAIL FROM:<CALLER@the.local.host.name>
+250 OK
+RCPT TO:<abcd@xyz>
+250 OK
+DATA
+354 SEND IT
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@the.local.host.name>)
+	id 10HmaX-0005vi-00
+	for abcd@xyz; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test data.
+.
+850 NONSENSE
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO the.local.host.name
+250 OK
+MAIL FROM:<CALLER@the.local.host.name>
+850 RUBBISH
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO the.local.host.name
+250 OK
+MAIL FROM:<CALLER@the.local.host.name>
+250 OK
+RCPT TO:<abcd@xyz>
+850 RUBBISH
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0475 b/test/stdout/0475
new file mode 100644
index 000000000..dd4af68db
--- /dev/null
+++ b/test/stdout/0475
@@ -0,0 +1,9 @@
+
+**** SMTP testing session as if from host V4NET.0.0.0
+**** 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 OK
+451 Temporary local problem - please try later
+221 the.local.host.name closing connection
diff --git a/test/stdout/0476 b/test/stdout/0476
new file mode 100644
index 000000000..b56f4823a
--- /dev/null
+++ b/test/stdout/0476
@@ -0,0 +1,15 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO the.local.host.name
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM:<CALLER@the.local.host.name>
+250 OK
+RCPT TO:<userx@test.ex>
+550 NO
+>*eof
+End of script
diff --git a/test/stdout/0479 b/test/stdout/0479
new file mode 100644
index 000000000..ff5883af6
--- /dev/null
+++ b/test/stdout/0479
@@ -0,0 +1,11 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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 [1.2.3.4] [1.2.3.4]
+250 OK
+250 Accepted
+250 Accepted
+221 the.local.host.name closing connection
diff --git a/test/stdout/0480 b/test/stdout/0480
new file mode 100644
index 000000000..603be0448
--- /dev/null
+++ b/test/stdout/0480
@@ -0,0 +1,56 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 host.V4NET.0.0.1 ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 host.V4NET.0.0.1 Hello a.b.c [1.2.3.4]
+221 host.V4NET.0.0.1 closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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 a.b.c [1.2.3.4]
+221 the.local.host.name closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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 a.b.c [1.2.3.4]
+221 the.local.host.name closing connection
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 host.127.0.0.1 ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo foobar
+??? 250
+<<< 250 host.127.0.0.1 Hello foobar [127.0.0.1]
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> quit
+??? 221
+<<< 221 host.127.0.0.1 closing connection
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+??? 220
+<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo foobar
+??? 250
+<<< 250 the.local.host.name Hello foobar [ip4.ip4.ip4.ip4]
+>>> quit
+??? 221
+<<< 221 the.local.host.name closing connection
+End of script
diff --git a/test/stdout/0482 b/test/stdout/0482
new file mode 100644
index 000000000..9ece5a3ad
--- /dev/null
+++ b/test/stdout/0482
@@ -0,0 +1,25 @@
+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 foobar
+??? 250
+<<< 250 myhost.test.ex Hello foobar [127.0.0.1]
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> From                                                                                                                                                                                                                              : userx
+>>> 
+>>> This is junk
+>>> .
+??? 5
+<<< 550 Administrative prohibition
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/0483 b/test/stdout/0483
new file mode 100644
index 000000000..483ea4b25
--- /dev/null
+++ b/test/stdout/0483
@@ -0,0 +1,5 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550 Administrative prohibition
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0484 b/test/stdout/0484
new file mode 100644
index 000000000..97b4a4d90
--- /dev/null
+++ b/test/stdout/0484
@@ -0,0 +1,13 @@
+> userx, usery
+> userx, usery
+> userx
+> userx
+> userx, usery
+> 
+> userx2, usery2
+> NOT FOUND
+> userx2, usery2
+> 
+> userx, usery
+> userx
+> 
diff --git a/test/stdout/0485 b/test/stdout/0485
new file mode 100644
index 000000000..14231bc51
--- /dev/null
+++ b/test/stdout/0485
@@ -0,0 +1,17 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at x.y.z [1.2.3.4]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+250 OK
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+250 OK
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0486 b/test/stdout/0486
new file mode 100644
index 000000000..5f9ea479d
--- /dev/null
+++ b/test/stdout/0486
@@ -0,0 +1,15 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at x.y.z
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0487 b/test/stdout/0487
new file mode 100644
index 000000000..6f73d3214
--- /dev/null
+++ b/test/stdout/0487
@@ -0,0 +1,10 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at x.y
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0488 b/test/stdout/0488
new file mode 100644
index 000000000..6acd7cee3
--- /dev/null
+++ b/test/stdout/0488
@@ -0,0 +1,34 @@
+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 myhost.test.ex closing connection
+10HmaX-0005vi-00-H
+CALLER UID GID
+<CALLER@myhost.test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local-smtp
+-body_linecount 0
+-auth_id CALLER
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-deliver_firsttime
+-local
+XX
+1
+userx@test.ex
+
+dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+dddF From: CALLER_NAME <CALLER@myhost.test.ex>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+011  X-1: first
+012  X-2: second
+011  X-3: third
+036  X-4: continued
+ with some more text
diff --git a/test/stdout/0490 b/test/stdout/0490
new file mode 100644
index 000000000..d5a87dabb
--- /dev/null
+++ b/test/stdout/0490
@@ -0,0 +1,33 @@
+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 body contains 2 binary zero characters
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+221 myhost.test.ex closing connection
+10HmaY-0005vi-00-H
+CALLER UID GID
+<CALLER@myhost.test.ex>
+ddddddddd 0
+-ident CALLER
+-received_protocol local-smtp
+-body_linecount 2
+-auth_id CALLER
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-deliver_firsttime
+-local
+XX
+1
+bb@test.ex
+
+dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaY-0005vi-00
+	for bb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+dddF From: CALLER_NAME <CALLER@myhost.test.ex>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0495 b/test/stdout/0495
new file mode 100644
index 000000000..35df989f5
--- /dev/null
+++ b/test/stdout/0495
@@ -0,0 +1,192 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at a.b
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbJ-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at a.b
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbK-0005vi-00
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<a@x.y>
+250 OK
+RCPT TO:<b@x.y>
+250 OK
+DATA
+354 OK
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This should succeed
+.
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<a@x.y>
+250 OK
+RCPT TO:<b@x.y>
+550 NOTOK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+550 BAD MAIL
+RCPT TO:<a@x.y>
+550 NOTOK
+RCPT TO:<b@x.y>
+550 NOTOK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+450 TEMPORARY MAIL FAIL
+RCPT TO:<a@x.y>
+450 NOTOK
+RCPT TO:<b@x.y>
+450 NOTOK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<pm@p.q>
+250 OK
+RCPT TO:<b@x.y>
+250 OK
+DATA
+354 OK
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This should succeed (alias to normal address)
+.
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM:<sen@der>
+250 OK
+RCPT TO:<a@x.y>
+250 OK
+RCPT TO:<b@x.y>
+250 OK
+DATA
+354 OK
+Received: from CALLER (helo=a.b)
+	by myhost.test.ex with local-esmtp (Exim x.yz)
+	(envelope-from <sen@der>)
+	id 10HmbJ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
+From: sen@der
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This should succeed.
+.
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<a@x.y>
+250 OK
+RCPT TO:<b@x.y>
+*sleep 2
+>*eof
+Listening on port 1224 ... 
+Connection request from [ip4.ip4.ip4.ip4]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<a@x.y>
+250 OK
+RCPT TO:<b@x.y>
+*sleep 2
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250-PIPELINING
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<a@x.y>
+550 SORRY
+QUIT
+221 BYE
+End of script
diff --git a/test/stdout/0496 b/test/stdout/0496
new file mode 100644
index 000000000..33be08901
--- /dev/null
+++ b/test/stdout/0496
@@ -0,0 +1,6 @@
+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 myhost.test.ex closing connection
diff --git a/test/stdout/0497 b/test/stdout/0497
new file mode 100644
index 000000000..1b0cdbcea
--- /dev/null
+++ b/test/stdout/0497
@@ -0,0 +1,20 @@
++++++++++++++++++++++++++++
+  R:userx@x.y -44 13377 SMTP error from remote mail server after RCPT TO:<userx@x.y>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+first failed = time last try = time2 next try = time2 + 0 *
+  T:127.0.0.1:127.0.0.1:1224 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<userx@x.y>
+452 temporary error
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0498 b/test/stdout/0498
new file mode 100644
index 000000000..d3811ad0f
--- /dev/null
+++ b/test/stdout/0498
@@ -0,0 +1,39 @@
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 DELAY
+first failed = time last try = time2 next try = time2 + 10
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+450 DELAY
+QUIT
+225 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO myhost.test.ex
+250-server id
+250 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<userx@x.y>
+250 OK
+DATA
+345 OK
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+*sleep 2
+End of script
diff --git a/test/stdout/0499 b/test/stdout/0499
new file mode 100644
index 000000000..ee5d6f1a5
--- /dev/null
+++ b/test/stdout/0499
@@ -0,0 +1,2 @@
+ph@mxt1.test.ex
+  router = r1, transport = t1
diff --git a/test/stdout/0500 b/test/stdout/0500
new file mode 100644
index 000000000..b13f1d275
--- /dev/null
+++ b/test/stdout/0500
@@ -0,0 +1,13 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+550-Verification failed for <x@y>
+550-Unrouteable address
+550 Sender verify failed
+221 myhost.test.ex closing connection
+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 myhost.test.ex closing connection
diff --git a/test/stdout/0501 b/test/stdout/0501
new file mode 100644
index 000000000..057562f13
--- /dev/null
+++ b/test/stdout/0501
@@ -0,0 +1,4 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0502 b/test/stdout/0502
new file mode 100644
index 000000000..4b307e817
--- /dev/null
+++ b/test/stdout/0502
@@ -0,0 +1,21 @@
+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=10HmaX-0005vi-00
+250 OK
+250 Accepted
+250 Reset OK
+250 OK
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+221 Your message here
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0504 b/test/stdout/0504
new file mode 100644
index 000000000..6e9945a8b
--- /dev/null
+++ b/test/stdout/0504
@@ -0,0 +1,15 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+EHLO myhost.test.ex
+250-Hello there
+250 SIZE
+MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+250 OK
+RCPT TO:<userx@myhost.test.ex>
+250 OK
+DATA
+354 Send it
+End of script
diff --git a/test/stdout/0505 b/test/stdout/0505
new file mode 100644
index 000000000..597c2940f
--- /dev/null
+++ b/test/stdout/0505
@@ -0,0 +1,18 @@
+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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+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=10HmaZ-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+221 myhost.test.ex closing connection
+451 Temporary local problem - please try later
diff --git a/test/stdout/0507 b/test/stdout/0507
new file mode 100644
index 000000000..9156b5134
--- /dev/null
+++ b/test/stdout/0507
@@ -0,0 +1,40 @@
+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
+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
+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
+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
+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
+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
diff --git a/test/stdout/0509 b/test/stdout/0509
new file mode 100644
index 000000000..121db35e4
--- /dev/null
+++ b/test/stdout/0509
@@ -0,0 +1 @@
+550 Administrative prohibition
diff --git a/test/stdout/0510 b/test/stdout/0510
new file mode 100644
index 000000000..72eebab51
--- /dev/null
+++ b/test/stdout/0510
@@ -0,0 +1,24 @@
+Return-path copied from sender
+Sender      = sen@d.e.r
+Recipient   = CALLER@myhost.test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/0510.sfilter"
+
+Testprint: --------System filter---------
+Testprint: Sender:  sen@d.e.r
+Testprint: Subject: test 1
+Testprint: Body:    Body content. 
+Headers add "X-Header: Added in a system filter"
+Add 3 to n1
+Testprint: n1:      3
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
+Testing Exim filter file "TESTSUITE/aux-fixed/0510.ufilter"
+
+Testprint: --------User filter---------
+Testprint: Sender:  sen@d.e.r
+Testprint: Subject:  test 1
+Testprint: Body:     Body content. 
+Testprint: X-Header: Added in a system filter
+Testprint: sn1:      3
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
diff --git a/test/stdout/0511 b/test/stdout/0511
new file mode 100644
index 000000000..729a515d7
--- /dev/null
+++ b/test/stdout/0511
@@ -0,0 +1,65 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+EHLO myhost.test.ex
+250-Hello there
+250 SIZE
+MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+250 OK
+RCPT TO:<userx@myhost.test.ex>
+250 OK
+RCPT TO:<ph11@myhost.test.ex>
+250 OK
+RCPT TO:<ph12@myhost.test.ex>
+250 OK
+RCPT TO:<ph13@myhost.test.ex>
+250 OK
+RCPT TO:<ph14@myhost.test.ex>
+250 OK
+RCPT TO:<ph15@myhost.test.ex>
+250 OK
+RCPT TO:<ph16@myhost.test.ex>
+250 OK
+RCPT TO:<ph17@myhost.test.ex>
+250 OK
+RCPT TO:<ph18@myhost.test.ex>
+250 OK
+RCPT TO:<ph19@myhost.test.ex>
+250 OK
+RCPT TO:<ph20@myhost.test.ex>
+250 OK
+RCPT TO:<ph21@myhost.test.ex>
+250 OK
+RCPT TO:<ph22@myhost.test.ex>
+250 OK
+RCPT TO:<ph23@myhost.test.ex>
+250 OK
+RCPT TO:<ph24@myhost.test.ex>
+250 OK
+RCPT TO:<ph25@myhost.test.ex>
+250 OK
+DATA
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550-This is a very long error message, very long indeed, indeed, indeed.
+550 Final line.
+QUIT
+221 BYE
+End of script
diff --git a/test/stdout/0513 b/test/stdout/0513
new file mode 100644
index 000000000..7dbb5e82b
--- /dev/null
+++ b/test/stdout/0513
@@ -0,0 +1,13 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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-myhost.test.ex Hello a.b.c.d [1.2.3.4]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+451 >all relevant MX records point to non-existent hosts< ++++
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0514 b/test/stdout/0514
new file mode 100644
index 000000000..dd078c1c9
--- /dev/null
+++ b/test/stdout/0514
@@ -0,0 +1,27 @@
+ 0m   sss 10HmaX-0005vi-00 <"spaced user"@myhost.test.ex>
+          userx@myhost.test.ex
+
+10HmaX-0005vi-00-H
+CALLER UID GID
+<"spaced user"@myhost.test.ex>
+ddddddddd 0
+-ident spaced user
+-received_protocol local
+-body_linecount 1
+-auth_id spaced user
+-auth_sender spaced user@myhost.test.ex
+-allow_unqualified_recipient
+-allow_unqualified_sender
+-deliver_firsttime
+-local
+XX
+1
+userx@myhost.test.ex
+
+dddP Received: from "spaced user" by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <"spaced user"@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+dddF From: CALLER_NAME <"spaced user"@myhost.test.ex>
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0517 b/test/stdout/0517
new file mode 100644
index 000000000..58649f6f0
--- /dev/null
+++ b/test/stdout/0517
@@ -0,0 +1,12 @@
+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 myhost.test.ex closing connection
+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
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0518 b/test/stdout/0518
new file mode 100644
index 000000000..e94f8aa09
--- /dev/null
+++ b/test/stdout/0518
@@ -0,0 +1,109 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+250 Accepted
+221 myhost.test.ex closing connection
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+HELO myhost.test.ex
+250 Hi
+MAIL FROM:<>
+250 OK
+RCPT TO:<abc@include>
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+HELO myhost.test.ex
+250 Hi
+MAIL FROM:<>
+250 OK
+RCPT TO:<abc@exclude>
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+HELO myhost.test.ex
+250 Hi
+MAIL FROM:<>
+250 OK
+RCPT TO:<p+abc@include>
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+HELO myhost.test.ex
+250 Hi
+MAIL FROM:<>
+250 OK
+RCPT TO:<abc@exclude>
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+HELO myhost.test.ex
+250 Hi
+MAIL FROM:<>
+250 OK
+RCPT TO:<abc-s@include>
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+HELO myhost.test.ex
+250 Hi
+MAIL FROM:<>
+250 OK
+RCPT TO:<abc@exclude>
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+HELO myhost.test.ex
+250 Hi
+MAIL FROM:<>
+250 OK
+RCPT TO:<p+abc-s@include>
+250 OK
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+HELO myhost.test.ex
+250 Hi
+MAIL FROM:<>
+250 OK
+RCPT TO:<abc@exclude>
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/0524 b/test/stdout/0524
new file mode 100644
index 000000000..854803911
--- /dev/null
+++ b/test/stdout/0524
@@ -0,0 +1,36 @@
+
+**** SMTP testing session as if from host V4NET.9.8.7
+**** 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-myhost.test.ex Hello csa1.test.ex [V4NET.9.8.7]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Reset OK
+250-myhost.test.ex Hello csa2.test.ex [V4NET.9.8.7]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+550 CSA status is fail
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.9.8.8
+**** 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-myhost.test.ex Hello csa1.test.ex [V4NET.9.8.8]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+550 CSA status is fail
+250 Reset OK
+250-myhost.test.ex Hello csa2.test.ex [V4NET.9.8.8]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+550 CSA status is fail
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0525 b/test/stdout/0525
new file mode 100644
index 000000000..bf3f0911b
--- /dev/null
+++ b/test/stdout/0525
@@ -0,0 +1,21 @@
+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 myhost.test.ex closing connection
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+EHLO myhost.test.ex
+250 Hi
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<def@pqr>
+250 OK
+DATA
+354 SEND
+*sleep 3
+End of script
diff --git a/test/stdout/0526 b/test/stdout/0526
new file mode 100644
index 000000000..82bd55f34
--- /dev/null
+++ b/test/stdout/0526
@@ -0,0 +1,2 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0527 b/test/stdout/0527
new file mode 100644
index 000000000..180c02a10
--- /dev/null
+++ b/test/stdout/0527
@@ -0,0 +1,22 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+550-Verification failed for <unknown@x.x.x.x>
+550-Called:   127.0.0.1
+550-Sent:     RCPT TO:<unknown@x.x.x.x>
+550-Response: 550 unrouteable address
+550 Sender verify failed
+221 myhost.test.ex closing connection
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+HELO myhost.test.ex
+250 Hi
+MAIL FROM:<>
+250 OK
+RCPT TO:<unknown@x.x.x.x>
+550 unrouteable address
+QUIT
+221 Bye
+End of script
diff --git a/test/stdout/0528 b/test/stdout/0528
new file mode 100644
index 000000000..71aa0173b
--- /dev/null
+++ b/test/stdout/0528
@@ -0,0 +1,7 @@
+x@y
+  router = r1, transport = t1
+  host host 127.0.0.1 [127.0.0.1] port=1225
+  host host 127.0.0.1 [127.0.0.1] port=1226
+  host host 127.0.0.1 [127.0.0.1] port=1227
+  host host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] port=1228
+  host host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] port=1223
diff --git a/test/stdout/1000 b/test/stdout/1000
new file mode 100644
index 000000000..b9ec648b7
--- /dev/null
+++ b/test/stdout/1000
@@ -0,0 +1,19 @@
+
+**** SMTP testing session as if from host 2001:0ab8:037f:0020:0000:0000:0000:0001
+**** 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
+421 myhost.test.ex lost input connection
+
+**** SMTP testing session as if from host V6NET:1234:0005:0006:0007:0008:0abc:000d
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+550 Administrative prohibition
+
+**** SMTP testing session as if from host V6NET:ffff:836f:0a00:000a:0800:200a:c032
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+550 Administrative prohibition
diff --git a/test/stdout/1001 b/test/stdout/1001
new file mode 100644
index 000000000..5f397bc8e
--- /dev/null
+++ b/test/stdout/1001
@@ -0,0 +1,82 @@
+Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
+??? 250-
+<<< 250-myhost.test.ex Hello [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> To: userx@test.ex
+>>> 
+>>> EHLO [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> ehlo [IPV6:ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
+??? 250-
+<<< 250-myhost.test.ex Hello [IPV6:ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> To: userx@test.ex
+>>> 
+>>> EHLO [IPV6:ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
+>>> .
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
+>>> ehlo [IPV6:V6NET:0:12:1:a00:20ff:fe86:a062]
+??? 250-
+<<< 250-myhost.test.ex Hello [IPV6:V6NET:0:12:1:a00:20ff:fe86:a062] [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> To: userx@test.ex
+>>> 
+>>> EHLO [IPV6:V6NET:0:12:1:a00:20ff:fe86:a062]
+>>> .
+??? 250
+<<< 250 OK id=10HmaZ-0005vi-00
+>>> ehlo ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6
+??? 501
+<<< 501 Syntactically invalid EHLO argument(s)
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/1002 b/test/stdout/1002
new file mode 100644
index 000000000..09717129e
--- /dev/null
+++ b/test/stdout/1002
@@ -0,0 +1,10 @@
+
+**** SMTP testing session as if from host V4NET.1.1.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
+550 domain doesn't match @mx_any/ignore=<;127.0.0.1;::1
+221 myhost.test.ex closing connection
diff --git a/test/stdout/1005 b/test/stdout/1005
new file mode 100644
index 000000000..fdbda6cc6
--- /dev/null
+++ b/test/stdout/1005
@@ -0,0 +1,2 @@
+userx@eximtesthost.ipv6.test.ex cannot be resolved at this time:
+  lookup of host "eximtesthost.ipv6.test.ex" failed in lookuphost router
diff --git a/test/stdout/1006 b/test/stdout/1006
new file mode 100644
index 000000000..98fab55b4
--- /dev/null
+++ b/test/stdout/1006
@@ -0,0 +1,27 @@
+dnslookup@mx46.test.ex
+  router = r1, transport = smtp
+  host 46.test.ex [V4NET.0.0.4] MX=46
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46
+manualroute@test.ex
+  router = r2, transport = smtp
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] 
+  host 46.test.ex [V4NET.0.0.4]                          
+dnslookup@v6.test.ex
+  router = r1, transport = smtp
+  host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] 
+dnslookup@mx46.test.ex
+  router = r1, transport = smtp
+  host 46.test.ex [V4NET.0.0.4] MX=46
+manualroute@test.ex
+  router = r2, transport = smtp
+  host 46.test.ex [V4NET.0.0.4] 
+dnslookup@v6.test.ex is undeliverable:
+  Unrouteable address
+Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... failed: Connection refused
diff --git a/test/stdout/1008 b/test/stdout/1008
new file mode 100644
index 000000000..76982ea22
--- /dev/null
+++ b/test/stdout/1008
@@ -0,0 +1,43 @@
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
+first failed = time last try = time2 next try = time2 + 7200
+  T:::1:::1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host ::1 [::1]: 450 Temporary error
+first failed = time last try = time2 next try = time2 + 7200
+Transport: 127.0.0.1 [127.0.0.1]:1111 10HmaX-0005vi-00 error 0: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
+  first failed: 07-Mar-2000 12:21:52
+  last tried:   07-Mar-2000 12:21:52
+  next try at:  07-Mar-2000 12:21:52
+Transport: ::1 [::1]:1111 10HmaX-0005vi-00 error 0: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host ::1 [::1]: 450 Temporary error
+  first failed: 07-Mar-2000 12:21:52
+  last tried:   07-Mar-2000 12:21:52
+  next try at:  07-Mar-2000 12:21:52
+exinext exit code = 0
+Transport: ::1 [::1]:1111 10HmaX-0005vi-00 error 0: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host ::1 [::1]: 450 Temporary error
+  first failed: 07-Mar-2000 12:21:52
+  last tried:   07-Mar-2000 12:21:52
+  next try at:  07-Mar-2000 12:21:52
+exinext exit code = 0
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO the.local.host.name
+250-server id
+250 OK
+MAIL FROM:<CALLER@the.local.host.name>
+450 Temporary error
+QUIT
+250 OK
+Expected EOF read from client
+Listening on port 1224 ... 
+Connection request from [::]
+220 Server ready
+EHLO the.local.host.name
+250-server id
+250 OK
+MAIL FROM:<CALLER@the.local.host.name>
+450 Temporary error
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/2002 b/test/stdout/2002
new file mode 100644
index 000000000..af2d9d9d1
--- /dev/null
+++ b/test/stdout/2002
@@ -0,0 +1,102 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<CALLER@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<CALLER@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message.
+>>> .
+??? 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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Failed to start TLS
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Certificate file = TESTSUITE/aux-fixed/cert2
+Key file = TESTSUITE/aux-fixed/cert2
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<CALLER@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<CALLER@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message from a verified host.
+>>> .
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+
+**** SMTP testing session as if from host 10.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
+503 STARTTLS command used when not advertised
+221 myhost.test.ex closing connection
diff --git a/test/stdout/2003 b/test/stdout/2003
new file mode 100644
index 000000000..3f122f6c5
--- /dev/null
+++ b/test/stdout/2003
@@ -0,0 +1,68 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550
+<<< 550 unacceptable cipher TLS-1.0:RSA_AES_256_CBC_SHA1:32
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> helo rhu.barb
+??? 250
+<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1]
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message.
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2004 b/test/stdout/2004
new file mode 100644
index 000000000..e1b81abe1
--- /dev/null
+++ b/test/stdout/2004
@@ -0,0 +1,55 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550
+<<< 550 encryption required
+>>> 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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test unencrypted message.
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2005 b/test/stdout/2005
new file mode 100644
index 000000000..e3b06d363
--- /dev/null
+++ b/test/stdout/2005
@@ -0,0 +1,35 @@
+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
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@remote.test.ex>
+??? 550
+<<< 550 encryption required
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@remote.test.ex>
+??? 250
+<<< 250 Accepted
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2006 b/test/stdout/2006
new file mode 100644
index 000000000..2e0f1a1cf
--- /dev/null
+++ b/test/stdout/2006
@@ -0,0 +1,21 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
++++ 3
+End of script
diff --git a/test/stdout/2014 b/test/stdout/2014
new file mode 100644
index 000000000..40f342961
--- /dev/null
+++ b/test/stdout/2014
@@ -0,0 +1,224 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Failed to start TLS
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> helo rhu.barb
+??? 250
+<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1]
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550
+<<< 550 certificate not verified: peerdn=
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Certificate file = aux-fixed/cert2
+Key file = aux-fixed/cert2
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Connecting to 127.0.0.1 port 1225 ... connected
+Certificate file = aux-fixed/cert2
+Key file = aux-fixed/cert2
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Certificate file = aux-fixed/cert1
+Key file = aux-fixed/cert1
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+End of script
+Connecting to 127.0.0.1 port 1225 ... connected
+Certificate file = aux-fixed/cert1
+Key file = aux-fixed/cert1
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550-
+<<< 550-certificate not verified: peerdn=C=UK,L=Cambridge,O=University of
+??? 550
+<<< 550 Cambridge,OU=Computing Service,CN=Philip Hazel
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Certificate file = aux-fixed/cert2
+Key file = aux-fixed/cert2
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+End of script
+Connecting to 127.0.0.1 port 1225 ... connected
+Certificate file = aux-fixed/cert1
+Key file = aux-fixed/cert1
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550-
+<<< 550-certificate not verified: peerdn=C=UK,L=Cambridge,O=University of
+??? 550
+<<< 550 Cambridge,OU=Computing Service,CN=Philip Hazel
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2015 b/test/stdout/2015
new file mode 100644
index 000000000..4d04859fb
--- /dev/null
+++ b/test/stdout/2015
@@ -0,0 +1,21 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
++++ 2
+??? 421
+<<< 421 myhost.test.ex: SMTP command timeout - closing connection
+End of script
diff --git a/test/stdout/2016 b/test/stdout/2016
new file mode 100644
index 000000000..4fc9cc430
--- /dev/null
+++ b/test/stdout/2016
@@ -0,0 +1,13 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250-STARTTLS
+250 HELP
+STARTTLS
+220 Go ahead
+*sleep 2
+End of script
diff --git a/test/stdout/2018 b/test/stdout/2018
new file mode 100644
index 000000000..edf75b380
--- /dev/null
+++ b/test/stdout/2018
@@ -0,0 +1,60 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message.
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550
+<<< 550 "You must encrypt"
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2019 b/test/stdout/2019
new file mode 100644
index 000000000..4a55fc153
--- /dev/null
+++ b/test/stdout/2019
@@ -0,0 +1,55 @@
+Connecting to 127.0.0.1 port 1225 ... connected
+Attempting to start TLS
+Succeeded in starting TLS
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message.
+>>> .
+??? 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
+Certificate file = aux-fixed/cert2
+Key file = aux-fixed/cert2
+Attempting to start TLS
+Succeeded in starting TLS
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message from a verified host.
+>>> .
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2021 b/test/stdout/2021
new file mode 100644
index 000000000..fad916638
--- /dev/null
+++ b/test/stdout/2021
@@ -0,0 +1,57 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250-STARTTLS
+250 PIPELINING
+STARTTLS
+450 temp problem
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250-STARTTLS
+250 PIPELINING
+STARTTLS
+450 temp problem
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<x@y>
+250 OK
+DATA
+354 Go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250-STARTTLS
+250 PIPELINING
+STARTTLS
+450 temp problem
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/2022 b/test/stdout/2022
new file mode 100644
index 000000000..4630f0897
--- /dev/null
+++ b/test/stdout/2022
@@ -0,0 +1,28 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> help
+??? 214-
+<<< 214-Commands supported:
+??? 214
+<<< 214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2023 b/test/stdout/2023
new file mode 100644
index 000000000..432c2f67b
--- /dev/null
+++ b/test/stdout/2023
@@ -0,0 +1,8 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at a.b.c [10.9.8.10]
+250-SIZE 52428800
+250-PIPELINING
+250-STARTTLS
+250 HELP
+550 Administrative prohibition
+221 myhost.test.ex closing connection
diff --git a/test/stdout/2024 b/test/stdout/2024
new file mode 100644
index 000000000..0d69aa1b7
--- /dev/null
+++ b/test/stdout/2024
@@ -0,0 +1,43 @@
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Certificate file = aux-fixed/cert2
+Key file = aux-fixed/cert2
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Failed to start TLS
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Certificate file = aux-fixed/cert2
+Key file = aux-fixed/cert2
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 454
+<<< 454 TLS currently unavailable
+Abandoning TLS start attempt
+End of script
diff --git a/test/stdout/2028 b/test/stdout/2028
new file mode 100644
index 000000000..878abef4e
--- /dev/null
+++ b/test/stdout/2028
@@ -0,0 +1,41 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Connecting to 127.0.0.1 port 1226 ... connected
+Attempting to start TLS
+Succeeded in starting TLS
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2102 b/test/stdout/2102
new file mode 100644
index 000000000..7402a8578
--- /dev/null
+++ b/test/stdout/2102
@@ -0,0 +1,148 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> mail from:<CALLER@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<CALLER@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message.
+>>> .
+??? 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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server certificate request A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client certificate A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSLv3 read finished A
+pppp:error:14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40
+Failed to start TLS
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Certificate file = TESTSUITE/aux-fixed/cert2
+Key file = TESTSUITE/aux-fixed/cert2
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server certificate request A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client certificate A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write certificate verify A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> mail from:<CALLER@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<CALLER@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message from a verified host.
+>>> .
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+
+**** SMTP testing session as if from host 10.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
+503 STARTTLS command used when not advertised
+221 myhost.test.ex closing connection
diff --git a/test/stdout/2103 b/test/stdout/2103
new file mode 100644
index 000000000..e9918dc2a
--- /dev/null
+++ b/test/stdout/2103
@@ -0,0 +1,96 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550
+<<< 550 unacceptable cipher TLSv1:AES256-SHA:256
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> helo rhu.barb
+??? 250
+<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1]
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message.
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2104 b/test/stdout/2104
new file mode 100644
index 000000000..e1b81abe1
--- /dev/null
+++ b/test/stdout/2104
@@ -0,0 +1,55 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550
+<<< 550 encryption required
+>>> 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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test unencrypted message.
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2105 b/test/stdout/2105
new file mode 100644
index 000000000..b12ed018c
--- /dev/null
+++ b/test/stdout/2105
@@ -0,0 +1,49 @@
+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
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@remote.test.ex>
+??? 550
+<<< 550 encryption required
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@remote.test.ex>
+??? 250
+<<< 250 Accepted
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2106 b/test/stdout/2106
new file mode 100644
index 000000000..30ab3d068
--- /dev/null
+++ b/test/stdout/2106
@@ -0,0 +1,35 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
++++ 3
+End of script
diff --git a/test/stdout/2114 b/test/stdout/2114
new file mode 100644
index 000000000..f675141ce
--- /dev/null
+++ b/test/stdout/2114
@@ -0,0 +1,355 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server certificate request A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client certificate A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSLv3 read finished A
+pppp:error:14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40
+Failed to start TLS
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server certificate request A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client certificate A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> helo rhu.barb
+??? 250
+<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1]
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550
+<<< 550 certificate not verified: peerdn=
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Certificate file = aux-fixed/cert2
+Key file = aux-fixed/cert2
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server certificate request A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client certificate A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write certificate verify A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Connecting to 127.0.0.1 port 1225 ... connected
+Certificate file = aux-fixed/cert2
+Key file = aux-fixed/cert2
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server certificate request A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client certificate A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write certificate verify A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Certificate file = aux-fixed/cert1
+Key file = aux-fixed/cert1
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server certificate request A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client certificate A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write certificate verify A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSLv3 read finished A
+pppp:error:14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48
+Failed to start TLS
+End of script
+Connecting to 127.0.0.1 port 1225 ... connected
+Certificate file = aux-fixed/cert1
+Key file = aux-fixed/cert1
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server certificate request A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client certificate A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write certificate verify A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550-
+<<< 550-certificate not verified: peerdn=/C=UK/L=Cambridge/O=University of
+??? 550
+<<< 550 Cambridge/OU=Computing Service/CN=Philip Hazel
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Certificate file = aux-fixed/cert2
+Key file = aux-fixed/cert2
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server certificate request A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client certificate A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write certificate verify A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSLv3 read finished A
+pppp:error:14094414:SSL routines:SSL3_READ_BYTES:sslv3 alert certificate revoked:s3_pkt.c:dddd:SSL alert number 44
+Failed to start TLS
+End of script
+Connecting to 127.0.0.1 port 1225 ... connected
+Certificate file = aux-fixed/cert1
+Key file = aux-fixed/cert1
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server certificate request A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client certificate A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write certificate verify A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550-
+<<< 550-certificate not verified: peerdn=/C=UK/L=Cambridge/O=University of
+??? 550
+<<< 550 Cambridge/OU=Computing Service/CN=Philip Hazel
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2115 b/test/stdout/2115
new file mode 100644
index 000000000..4d04859fb
--- /dev/null
+++ b/test/stdout/2115
@@ -0,0 +1,21 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
++++ 2
+??? 421
+<<< 421 myhost.test.ex: SMTP command timeout - closing connection
+End of script
diff --git a/test/stdout/2116 b/test/stdout/2116
new file mode 100644
index 000000000..4fc9cc430
--- /dev/null
+++ b/test/stdout/2116
@@ -0,0 +1,13 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250-STARTTLS
+250 HELP
+STARTTLS
+220 Go ahead
+*sleep 2
+End of script
diff --git a/test/stdout/2118 b/test/stdout/2118
new file mode 100644
index 000000000..71fc3db0e
--- /dev/null
+++ b/test/stdout/2118
@@ -0,0 +1,74 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message.
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 550
+<<< 550 "You must encrypt"
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2119 b/test/stdout/2119
new file mode 100644
index 000000000..b1705309f
--- /dev/null
+++ b/test/stdout/2119
@@ -0,0 +1,86 @@
+Connecting to 127.0.0.1 port 1225 ... connected
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message.
+>>> .
+??? 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
+Certificate file = aux-fixed/cert2
+Key file = aux-fixed/cert2
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server certificate request A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client certificate A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write certificate verify A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message from a verified host.
+>>> .
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2121 b/test/stdout/2121
new file mode 100644
index 000000000..fad916638
--- /dev/null
+++ b/test/stdout/2121
@@ -0,0 +1,57 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250-STARTTLS
+250 PIPELINING
+STARTTLS
+450 temp problem
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250-STARTTLS
+250 PIPELINING
+STARTTLS
+450 temp problem
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<x@y>
+250 OK
+DATA
+354 Go ahead
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250-STARTTLS
+250 PIPELINING
+STARTTLS
+450 temp problem
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/2122 b/test/stdout/2122
new file mode 100644
index 000000000..90f949d15
--- /dev/null
+++ b/test/stdout/2122
@@ -0,0 +1,42 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> help
+??? 214-
+<<< 214-Commands supported:
+??? 214
+<<< 214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2123 b/test/stdout/2123
new file mode 100644
index 000000000..432c2f67b
--- /dev/null
+++ b/test/stdout/2123
@@ -0,0 +1,8 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at a.b.c [10.9.8.10]
+250-SIZE 52428800
+250-PIPELINING
+250-STARTTLS
+250 HELP
+550 Administrative prohibition
+221 myhost.test.ex closing connection
diff --git a/test/stdout/2124 b/test/stdout/2124
new file mode 100644
index 000000000..fe58b057a
--- /dev/null
+++ b/test/stdout/2124
@@ -0,0 +1,59 @@
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Certificate file = aux-fixed/cert2
+Key file = aux-fixed/cert2
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server certificate request A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client certificate A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write certificate verify A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSLv3 read finished A
+pppp:error:14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48
+Failed to start TLS
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Certificate file = aux-fixed/cert2
+Key file = aux-fixed/cert2
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 454
+<<< 454 TLS currently unavailable
+Abandoning TLS start attempt
+End of script
diff --git a/test/stdout/2128 b/test/stdout/2128
new file mode 100644
index 000000000..ebcbcb91a
--- /dev/null
+++ b/test/stdout/2128
@@ -0,0 +1,69 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Connecting to 127.0.0.1 port 1226 ... connected
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/2200 b/test/stdout/2200
new file mode 100644
index 000000000..bce322f54
--- /dev/null
+++ b/test/stdout/2200
@@ -0,0 +1,43 @@
+> test.ex                    A TXT record for test.ex.
+> txt=test.ex                A TXT record for test.ex.
+> a=black-1.test.ex          V4NET.11.12.13
+> Failed: lookup of "xxx=test.ex" gave DEFER: unsupported DNS record type
+> a=localhost.test.ex        127.0.0.1
+> cname=alias-eximtesthost.test.ex eximtesthost.test.ex
+> ns=test.ex                 exim.test.ex
+> zns=x.y.z.test.ex          exim.test.ex
+> mx=mxt1.test.ex            5 eximtesthost.test.ex
+> mx=mxt3.test.ex            5 not-exist.test.ex
+6 eximtesthost.test.ex
+> mxh=mxt1.test.ex           eximtesthost.test.ex
+> ptr=V4NET.0.0.1            ten-1.test.ex
+> ptr=ptr.test.ex            data.for.ptr.test.ex
+> srv=_smtp._tcp.srv01.test.ex     0 0 25 ten-1.test.ex
+> srv=_smtp._tcp.nosmtp.test.ex    0 0 0 
+> 
+> csa=csa1.test.ex           Y csa1.test.ex
+> csa=csa2.test.ex           N csa2.test.ex
+> 
+> # DNS lookups with multiple items
+> 
+> ten-1:ten2                 V4NET.0.0.1
+V4NET.0.0.2
+> ten-1:defer:ten2           V4NET.0.0.1
+V4NET.0.0.2
+> ten-1|ten2                 V4NET.0.0.1
+V4NET.0.0.2
+> mxt1;mxt2 | output         5 eximtesthost.test.ex|5 not-exist.test.ex
+> mxt1;mxt2 | output         eximtesthost.test.ex|not-exist.test.ex
+> 13/14 rbl                  This is a test blacklisting message This is a test blacklisting message
+> double ptr                 ten-1.test.ex
+ten-2.test.ex
+> ten-1:bad                  V4NET.0.0.1
+> bad:bad                    FAILED
+> 
+> Failed: lookup of "a=test.again.dns:test.again.dns" gave DEFER: 
+> defer_lax:ten-1            V4NET.0.0.1
+> defer_lax:ten-1            V4NET.0.0.1
+> defer_never:ten-1          V4NET.0.0.1
+> defer_never:defer          
+> Failed: lookup of "defer_strict,a=test.again.dns:ten-1.test.ex" gave DEFER: 
+> 
diff --git a/test/stdout/2201 b/test/stdout/2201
new file mode 100644
index 000000000..2dedd9392
--- /dev/null
+++ b/test/stdout/2201
@@ -0,0 +1,8 @@
+test.ex@test.ex
+  router = r1, transport = local_delivery
+unknown@test.ex
+  router = r2, transport = local_delivery
+test.ex@test.ex
+  router = r1, transport = local_delivery
+unknown@test.ex is undeliverable:
+  Unrouteable address
diff --git a/test/stdout/2250 b/test/stdout/2250
new file mode 100644
index 000000000..3b9e93a4a
--- /dev/null
+++ b/test/stdout/2250
@@ -0,0 +1,3 @@
+> ptr=V6NET:0:12:1:a00:20ff:fe86:a062 testptr-arpa.ipv6.test.ex
+> ptr=V6NET:0:12:1:a00:20ff:fe86:a062 testptr-arpa.ipv6.test.ex
+> 
diff --git a/test/stdout/2300 b/test/stdout/2300
new file mode 100644
index 000000000..72a38b64a
--- /dev/null
+++ b/test/stdout/2300
@@ -0,0 +1,18 @@
+1 entry written
+exim_dbmbuild exit code = 0
+> lsearch: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+> dbm:     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+> 
+Overlong line read: max permitted length is 19999
+dbmbuild abandoned
+exim_dbmbuild exit code = 2
+Continued set of lines is too long: max permitted length is 99999
+dbmbuild abandoned
+exim_dbmbuild exit code = 2
+5 entries written
+exim_dbmbuild exit code = 0
+> [abc]
+> [abc:]
+> [#xyz:]
+> [a "b" c]
+> 
diff --git a/test/stdout/2400 b/test/stdout/2400
new file mode 100644
index 000000000..30e14b09d
--- /dev/null
+++ b/test/stdout/2400
@@ -0,0 +1,9 @@
+> data for first
+> data for first
+> failure value
+> Failed: "lookup" failed and "fail" requested
+> A=1 B=2
+> 1
+> 2
+> Failed: "extract" failed and "fail" requested
+> 
diff --git a/test/stdout/2500 b/test/stdout/2500
new file mode 100644
index 000000000..5ee50c37c
--- /dev/null
+++ b/test/stdout/2500
@@ -0,0 +1,4 @@
+> 2500.tst
+> FAIL
+> Failed: failed to open TESTSUITE/AUX-fixed for directory search: No such file or directory
+> 
diff --git a/test/stdout/2501 b/test/stdout/2501
new file mode 100644
index 000000000..262dc94ae
--- /dev/null
+++ b/test/stdout/2501
@@ -0,0 +1,5 @@
+xxx@okdomain
+  router = r1, transport = t1
+yyy@notokdomain is undeliverable:
+  Unrouteable address
+syntax error: malformed address: /mod may not follow zzz@dom
diff --git a/test/stdout/2600 b/test/stdout/2600
new file mode 100644
index 000000000..2b11b92df
--- /dev/null
+++ b/test/stdout/2600
@@ -0,0 +1,34 @@
+> Ayen Other
+> Ayen Other
+> 
+> 
+> id=nothing name="" 
+> name="\"stquot" id=quote2 
+> name="before
+after" id=newline 
+> name="x	x" id=tab 
+> name=it's id=its 
+> name=it's id=its 
+> 
+
+**** SMTP testing session as if from host 10.0.0.0
+**** 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 relay not permitted
+550 relay not permitted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 10.10.10.10
+**** 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
+250 Accepted
+221 myhost.test.ex closing connection
+> Ayen Other
+> 
diff --git a/test/stdout/3000 b/test/stdout/3000
new file mode 100644
index 000000000..d06d48ab0
--- /dev/null
+++ b/test/stdout/3000
@@ -0,0 +1,68 @@
+> Subroutine foo called with args: 
+> Subroutine foo called with args: arg1
+> Failed: Perl subroutine "foo_undef" returned undef to force failure
+> Failed: expiring... at TESTSUITE/aux-fixed/3000.pl line 7.
+
+> Wrote warning
+> Failed: Undefined subroutine &main::unknown called.
+
+> myhost.test.ex
+> Failed: syntax error in Exim::expand_string argument: unknown variable name "notexists" at TESTSUITE/aux-fixed/3000.pl line 9.
+
+> 
+> Failed: missing or misplaced { or }
+> Subroutine foo called with args: 1 2 3 4 5 6 7 8
+> Failed: Too many arguments for "perl" (max is 9)
+> 
+> 42
+> 30
+> 3
+> 2/8
+> 
+> Tue, 2 Mar 1999 09:44:33 +0000 // Changed locale // Tue, 2 Mar 1999 09:44:33 +0000
+> 
+> Subroutine foo called with args: arg1
+> Failed: Perl subroutine "foo_undef" returned undef to force failure
+> Wrote debug
+> Wrote log
+> 
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at x.y.z
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 10.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-myhost.test.ex Hello x.y.z [10.0.0.1]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+221 myhost.test.ex 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
+>>> helo x.y.z
+??? 250
+<<< 250 myhost.test.ex Hello x.y.z [127.0.0.1]
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<abc@x.y.z>
+??? 250
+<<< 250 Accepted
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+> Discarded warnings
+> Wrote warning
+> 
diff --git a/test/stdout/3100 b/test/stdout/3100
new file mode 100644
index 000000000..4ad8faf78
--- /dev/null
+++ b/test/stdout/3100
@@ -0,0 +1,5 @@
+> Failed: (no message)
+> one argument
+> Failed: yield FAIL_FORCED
+> Failed: yield FAIL
+> 
diff --git a/test/stdout/3200 b/test/stdout/3200
new file mode 100644
index 000000000..8c3398326
--- /dev/null
+++ b/test/stdout/3200
@@ -0,0 +1,3 @@
+> match_ip:        12 true
+> match_ip:        13 
+> 
diff --git a/test/stdout/3201 b/test/stdout/3201
new file mode 100644
index 000000000..c174ea0d3
--- /dev/null
+++ b/test/stdout/3201
@@ -0,0 +1,12 @@
+
+**** SMTP testing session as if from host 10.0.0.1
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+550 Administrative prohibition
+
+**** SMTP testing session as if from host 10.0.0.2
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+550 Administrative prohibition
diff --git a/test/stdout/3202 b/test/stdout/3202
new file mode 100644
index 000000000..df43ee850
--- /dev/null
+++ b/test/stdout/3202
@@ -0,0 +1,27 @@
+
+**** SMTP testing session as if from host 1.1.1.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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.1.2.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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.1.3.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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
diff --git a/test/stdout/3204 b/test/stdout/3204
new file mode 100644
index 000000000..2af1ddf9a
--- /dev/null
+++ b/test/stdout/3204
@@ -0,0 +1,9 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
diff --git a/test/stdout/3205 b/test/stdout/3205
new file mode 100644
index 000000000..2881c1b81
--- /dev/null
+++ b/test/stdout/3205
@@ -0,0 +1,18 @@
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 4.3.2.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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
diff --git a/test/stdout/3206 b/test/stdout/3206
new file mode 100644
index 000000000..03d607b5a
--- /dev/null
+++ b/test/stdout/3206
@@ -0,0 +1,3 @@
+a@test.ex verified
+b@other.domain cannot be resolved at this time:
+  domains check lookup or other defer
diff --git a/test/stdout/3208 b/test/stdout/3208
new file mode 100644
index 000000000..31a146173
--- /dev/null
+++ b/test/stdout/3208
@@ -0,0 +1,21 @@
+
+**** SMTP testing session as if from host V4NET.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-myhost.test.ex Hello remote.host [V4NET.0.0.1]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+451 Temporary local problem - please try later
+451 Temporary local problem - please try later
+250 Accepted
+451 Temporary local problem - please try later
+250 Accepted
+451 Temporary local problem - please try later
+250 Accepted
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
diff --git a/test/stdout/3210 b/test/stdout/3210
new file mode 100644
index 000000000..38b9c1911
--- /dev/null
+++ b/test/stdout/3210
@@ -0,0 +1,2 @@
+userx@test.ex cannot be resolved at this time:
+  domains check lookup or other defer
diff --git a/test/stdout/3211 b/test/stdout/3211
new file mode 100644
index 000000000..e066078a7
--- /dev/null
+++ b/test/stdout/3211
@@ -0,0 +1,22 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
diff --git a/test/stdout/3212 b/test/stdout/3212
new file mode 100644
index 000000000..549bdbdd7
--- /dev/null
+++ b/test/stdout/3212
@@ -0,0 +1,14 @@
+> userx, usery
+> userx, usery
+> userx
+> userx
+> userx, usery
+> 
+> something
+> something
+> nocache
+> something
+> 
+> userx, usery
+> userx
+> 
diff --git a/test/stdout/3213 b/test/stdout/3213
new file mode 100644
index 000000000..df9841e5f
--- /dev/null
+++ b/test/stdout/3213
@@ -0,0 +1,6 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at x.y.z
+250 OK
+250 Reset OK
+250 OK
+221 myhost.test.ex closing connection
diff --git a/test/stdout/3300 b/test/stdout/3300
new file mode 100644
index 000000000..1859bb184
--- /dev/null
+++ b/test/stdout/3300
@@ -0,0 +1,31 @@
+> BadCrypt: no
+> MySecret: yes
+> MySecret: no
+> MySecret: yes
+> MySecret: no
+> 
+> crypt16: yes
+> crypt16: yes
+> crypt16: no
+> crypt16: yes
+> 
+> test: yes
+> test: yes
+> test: no
+> test: yes
+> test: no
+> test: no
+> 
+> abc:  yes
+> abc:  yes
+> abc:  yes
+> abd:  no
+> 
+> # Combinations
+> 
+> Y:      Y
+> Y:      Y
+> Y:      Y
+> N:      N
+> N:      N
+> 
diff --git a/test/stdout/3400 b/test/stdout/3400
new file mode 100644
index 000000000..7d8e3689a
--- /dev/null
+++ b/test/stdout/3400
@@ -0,0 +1,328 @@
+
+**** SMTP testing session as if from host 10.0.0.2
+**** 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 Reset OK
+250 <userx@test.ex> is deliverable
+553 list@test.ex is undeliverable
+250 OK
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 10.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-myhost.test.ex Hello test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+252 authentication required
+550 authentication required
+458 authentication required
+250 OK
+550 authentication required
+250 OK
+250 Reset OK
+235 Authentication succeeded
+503 already authenticated
+250 OK
+250 Accepted
+550 relay not permitted
+250 Reset OK
+250 <userx@test.ex> is deliverable
+553 list@test.ex is undeliverable
+250 OK
+250 OK
+503 already authenticated
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 10.0.0.3
+**** 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-myhost.test.ex Hello test.host [10.0.0.3]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+250 OK
+550 authentication required
+250 Reset OK
+235 Authentication succeeded
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at testclient.ex [10.0.0.3]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+235 Authentication succeeded
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbA-0005vi-00
+501 invalid data for AUTH
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbB-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+235 Authentication succeeded
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+435 Unable to authenticate at present: account suspended
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+535 Incorrect authentication data
+500 unrecognized command
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+334 VXNlciBOYW1l
+334 UGFzc3dvcmQ=
+235 Authentication succeeded
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+334 VXNlciBOYW1l
+235 Authentication succeeded
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+235 Authentication succeeded
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+334 UGFzc3dvcmQ=
+235 Authentication succeeded
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+334 VXNlciBOYW1l
+334 UGFzc3dvcmQ=
+501 Authentication cancelled
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 10.0.0.4
+**** 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-myhost.test.ex Hello test.host [10.0.0.4]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250 HELP
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+535 Incorrect authentication data
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+334 
+235 Authentication succeeded
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+334 bXlob3N0LnRlc3QuZXg=
+235 Authentication succeeded
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+435 Unable to authenticate at present
+500 unrecognized command
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.2]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250 HELP
+503 AUTH command used when not advertised
+500 unrecognized command
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+535 Incorrect authentication data
+554 Too many nonmail commands
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbD-0005vi-00
+235 Authentication succeeded
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbE-0005vi-00
+503 already authenticated
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbF-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+334 VXNlciBOYW1l
+334 UGFzc3dvcmQ=
+535 Incorrect authentication data
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
+235 Authentication succeeded
+221 myhost.test.ex closing connection
diff --git a/test/stdout/3401 b/test/stdout/3401
new file mode 100644
index 000000000..fdaf26cd6
--- /dev/null
+++ b/test/stdout/3401
@@ -0,0 +1,152 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH LOGIN
+AUTH LOGIN
+334 VXNlciBOYW1l
+dXNlcng=
+334 UGFzc3dvcmQ=
+c2VjcmV0
+235 Authentication successful
+MAIL FROM:<CALLER@myhost.test.ex> AUTH=CALLER@myhost.test.ex
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH PLAIN
+AUTH PLAIN AHVzZXJ4AHNlY3JldA==
+235 Authentication successful
+MAIL FROM:<CALLER@myhost.test.ex> AUTH=CALLER@myhost.test.ex
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaY-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH PLAIN
+AUTH PLAIN AHVzZXJ4AHNlY3JldA==
+535 Sorry, authentication failed
+MAIL FROM:<CALLER@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaZ-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH LOGIN
+AUTH LOGIN
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH PLAIN
+AUTH PLAIN AHVzZXJ4AHNlY3JldA==
+535 Sorry, authentication failed
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250 HELP
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH LOGIN
+AUTH LOGIN
+334 VXNlciBOYW1l
+dXNlcng=
+334 UGFzc3dvcmQ=
+c2VjcmV0
+235 Authentication successful
+MAIL FROM:<CALLER@myhost.test.ex> AUTH=force@x.y.z
+250 Sender OK
+RCPT TO:<forcesender@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmbF-0005vi-00
+	for forcesender@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/3402 b/test/stdout/3402
new file mode 100644
index 000000000..7bd09ad8c
--- /dev/null
+++ b/test/stdout/3402
@@ -0,0 +1,18 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at testing.ex
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+235 Authentication succeeded
+250 OK
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at testing.ex
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+235 Authentication succeeded
+250 OK
+221 myhost.test.ex closing connection
diff --git a/test/stdout/3403 b/test/stdout/3403
new file mode 100644
index 000000000..2836caffb
--- /dev/null
+++ b/test/stdout/3403
@@ -0,0 +1,13 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at testing.ex
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+535 Incorrect authentication data
+235 Authentication succeeded
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/3404 b/test/stdout/3404
new file mode 100644
index 000000000..c78436c71
--- /dev/null
+++ b/test/stdout/3404
@@ -0,0 +1,93 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH PLAIN
+AUTH PLAIN AHVzZXJ4AHNlY3JldA==
+235 Authentication successful
+MAIL FROM:<CALLER@myhost.test.ex> AUTH=CALLER@myhost.test.ex
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+X-AID: >CALLER<
+
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH PLAIN
+AUTH PLAIN AHVzZXJ4AHNlY3JldA==
+235 Authentication successful
+MAIL FROM:<CALLER@myhost.test.ex> AUTH=xxx@yyy
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaY-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+X-AID: >zzz<
+
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH LOGIN
+AUTH LOGIN
+300 User?
+dXNlcng=
+300 Password?
+c2VjcmV0
+235 Authentication successful
+MAIL FROM:<CALLER@myhost.test.ex> AUTH=CALLER@myhost.test.ex
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaZ-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+X-AID: >CALLER<
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/3405 b/test/stdout/3405
new file mode 100644
index 000000000..6020e0591
--- /dev/null
+++ b/test/stdout/3405
@@ -0,0 +1,62 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH PLAIN
+AUTH PLAIN AHVzZXJ4AHNlY3JldA==
+235 Authentication successful
+MAIL FROM:<CALLER@myhost.test.ex> AUTH=CALLER@myhost.test.ex
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+X-AID: >CALLER<
+X-TAID: >CALLER<
+
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH PLAIN
+AUTH PLAIN AHVzZXJ4AHNlY3JldA==
+235 Authentication successful
+MAIL FROM:<CALLER@myhost.test.ex> AUTH=CALLER@myhost.test.ex
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaY-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+X-AID: >CALLER<
+X-TAID: >CALLER<
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/3406 b/test/stdout/3406
new file mode 100644
index 000000000..602d3c5bd
--- /dev/null
+++ b/test/stdout/3406
@@ -0,0 +1,32 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at testing.ex [10.0.0.2]
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH FIRST
+250 HELP
+235 Authentication succeeded
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at testing.ex [10.0.0.3]
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH SECOND
+250 HELP
+504 first authentication mechanism not supported
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at testing.ex [10.0.0.2]
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH FIRST
+250 HELP
+504 second authentication mechanism not supported
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at testing.ex [10.0.0.3]
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH SECOND
+250 HELP
+235 Authentication succeeded
+221 myhost.test.ex closing connection
diff --git a/test/stdout/3407 b/test/stdout/3407
new file mode 100644
index 000000000..3888ec9ed
--- /dev/null
+++ b/test/stdout/3407
@@ -0,0 +1,44 @@
+
+a1 authenticator:
+driver = plaintext
+public_name = PLAIN
+server_advertise_condition = 
+server_debug_print = 
+server_mail_auth_condition = 
+server_set_id = 
+client_send = 
+server_condition = xxx
+server_prompts = 
+
+a2 authenticator:
+driver = plaintext
+public_name = PLAIN
+server_advertise_condition = 
+server_debug_print = 
+server_mail_auth_condition = 
+server_set_id = 
+client_send = 
+server_condition = 
+server_prompts = 
+
+a3 authenticator:
+driver = plaintext
+public_name = LOGIN
+server_advertise_condition = 
+server_debug_print = 
+server_mail_auth_condition = 
+server_set_id = 
+client_send = 
+server_condition = 
+server_prompts = 
+
+a4 authenticator:
+driver = plaintext
+public_name = LOGIN
+server_advertise_condition = 
+server_debug_print = 
+server_mail_auth_condition = 
+server_set_id = 
+client_send = 
+server_condition = 
+server_prompts = 
diff --git a/test/stdout/3408 b/test/stdout/3408
new file mode 100644
index 000000000..414a61d15
--- /dev/null
+++ b/test/stdout/3408
@@ -0,0 +1,41 @@
+
+**** SMTP testing session as if from host V4NET.11.12.14
+**** 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 exim.test.ex [V4NET.11.12.14]
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+250 OK
+250 Accepted
+550 host is listed in rbl.test.ex
+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 the.local.host.name closing connection
+
+**** SMTP testing session as if from host V4NET.11.12.14
+**** 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 exim.test.ex [V4NET.11.12.14]
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+235 Authentication succeeded
+250 OK
+250 Accepted
+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 the.local.host.name closing connection
diff --git a/test/stdout/3409 b/test/stdout/3409
new file mode 100644
index 000000000..9513787dc
--- /dev/null
+++ b/test/stdout/3409
@@ -0,0 +1,22 @@
+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 a.b.c
+250-SIZE 52428800
+250-ETRN
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+501 invalid character in authentication mechanism name
+235 Authentication succeeded
+503 already authenticated
+501 invalid data for AUTH
+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-the.local.host.name Hello CALLER at a.b.c
+250-SIZE 52428800
+250-ETRN
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+250 OK
+503 not permitted in mail transaction
+221 the.local.host.name closing connection
diff --git a/test/stdout/3410 b/test/stdout/3410
new file mode 100644
index 000000000..e9044b8e9
--- /dev/null
+++ b/test/stdout/3410
@@ -0,0 +1,53 @@
+
+**** SMTP testing session as if from host 5.6.9.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 You must authenticate
+250 Reset OK
+250-myhost.test.ex Hello rhu.barb [5.6.9.1]
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN LOGIN
+250 HELP
+235 Authentication succeeded
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 5.6.10.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 Administrative prohibition
+250 Reset OK
+250-myhost.test.ex Hello rhu.barb [5.6.10.1]
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN LOGIN
+250 HELP
+235 Authentication succeeded
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 5.6.10.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-myhost.test.ex Hello rhu.barb [5.6.10.1]
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN LOGIN
+250 HELP
+334 VXNlciBOYW1l
+334 UGFzc3dvcmQ=
+235 Authentication succeeded
+250 OK
+550 Administrative prohibition
+221 myhost.test.ex closing connection
diff --git a/test/stdout/3411 b/test/stdout/3411
new file mode 100644
index 000000000..80c3e5fb1
--- /dev/null
+++ b/test/stdout/3411
@@ -0,0 +1,16 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at rhu.barb [10.0.0.0]
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+235 Authentication succeeded
+250 OK
+250 Accepted
+250 Accepted
+550 Unrouteable address
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/3412 b/test/stdout/3412
new file mode 100644
index 000000000..b7c7a379f
--- /dev/null
+++ b/test/stdout/3412
@@ -0,0 +1,52 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH PLAIN
+AUTH PLAIN AHVzZXJ4AHNlY3JldA==
+254 Authentication OK
+MAIL FROM:<> AUTH=mailer-daemon@test.ex
+250 Sender OK
+RCPT TO:<CALLER@myhost.test.ex>
+250 Recipient OK
+DATA
+354 Send data
+Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
+	id 10HmaY-0005vi-00
+	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+X-Failed-Recipients: x@test.ex
+Auto-Submitted: auto-replied
+From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
+To: CALLER@myhost.test.ex
+Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This message was created automatically by mail delivery software.
+
+A message that you sent could not be delivered to one or more of its
+recipients. This is a permanent error. The following address(es) failed:
+
+  x@test.ex
+    no deliveries made locally
+
+------ This is a copy of the message, including all the headers. ------
+
+Return-path: <CALLER@myhost.test.ex>
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/3413 b/test/stdout/3413
new file mode 100644
index 000000000..1835a9af6
--- /dev/null
+++ b/test/stdout/3413
@@ -0,0 +1,11 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at x.y.z
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+504 rhubarb authentication mechanism not supported
+504 rhubarb authentication mechanism not supported
+504 rhubarb authentication mechanism not supported
+504 rhubarb authentication mechanism not supported
+554 Too many nonmail commands
diff --git a/test/stdout/3414 b/test/stdout/3414
new file mode 100644
index 000000000..bcf0898cf
--- /dev/null
+++ b/test/stdout/3414
@@ -0,0 +1,52 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+250 OK
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+250 OK
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+250 OK
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+235 Authentication succeeded
+250 OK
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+235 Authentication succeeded
+250 OK
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at xxxx
+250-SIZE 52428800
+250-PIPELINING
+250-AUTH PLAIN
+250 HELP
+250 OK
+250 Reset OK
+250 OK
+221 myhost.test.ex closing connection
diff --git a/test/stdout/3415 b/test/stdout/3415
new file mode 100644
index 000000000..8cfc49d37
--- /dev/null
+++ b/test/stdout/3415
@@ -0,0 +1,263 @@
+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 rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250
+<<< 250 HELP
+>>> auth plain AHVzZXJuYW1lAG15c2VjcmV0
+??? 235
+<<< 235 Authentication succeeded
+>>> mail from:<a@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmaX-0005vi-00
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmaY-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250
+<<< 250 HELP
+>>> auth plain AHVzZXJuYW1lAG15c2VjcmV0
+??? 235
+<<< 235 Authentication succeeded
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmaZ-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250
+<<< 250 HELP
+>>> auth plain AHVzZXJuYW1lAG15c2VjcmV0
+??? 235
+<<< 235 Authentication succeeded
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> .
+??? 250
+<<< 250 OK id=10HmbA-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250
+<<< 250 HELP
+>>> auth plain AHVzZXJuYW1lAG15c2VjcmV0
+??? 235
+<<< 235 Authentication succeeded
+>>> mail from:<>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> From: abc@x.y.z
+>>> .
+??? 250
+<<< 250 OK id=10HmbB-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+10HmaX-0005vi-00-H
+CALLER UID GID
+<username@myhost.test.ex>
+ddddddddd 0
+-helo_name rhu.barb
+-host_address 127.0.0.1.9999
+-host_auth au1
+-interface_address 127.0.0.1.1225
+-received_protocol esmtpa
+-body_linecount 0
+-auth_id username
+-deliver_firsttime
+XX
+1
+x@y
+
+dddP Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtpa (Exim x.yz)
+	(envelope-from <username@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+dddF From: a@y
+dddS Sender: username@myhost.test.ex
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+10HmaY-0005vi-00-H
+CALLER UID GID
+<>
+ddddddddd 0
+-helo_name rhu.barb
+-host_address 127.0.0.1.9999
+-host_auth au1
+-interface_address 127.0.0.1.1225
+-received_protocol esmtpa
+-body_linecount 0
+-auth_id username
+-deliver_firsttime
+XX
+1
+x@y
+
+dddP Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtpa (Exim x.yz)
+	id 10HmaY-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+dddF From: username@myhost.test.ex
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+10HmaZ-0005vi-00-H
+CALLER UID GID
+<>
+ddddddddd 0
+-helo_name rhu.barb
+-host_address 127.0.0.1.9999
+-host_auth au1
+-interface_address 127.0.0.1.1225
+-received_protocol esmtpa
+-body_linecount 0
+-auth_id username
+-deliver_firsttime
+XX
+1
+x@y
+
+dddP Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtpa (Exim x.yz)
+	id 10HmaZ-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+dddF From: username@another.domain
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+10HmbA-0005vi-00-H
+CALLER UID GID
+<>
+ddddddddd 0
+-helo_name rhu.barb
+-host_address 127.0.0.1.9999
+-host_auth au1
+-interface_address 127.0.0.1.1225
+-received_protocol esmtpa
+-body_linecount 0
+-auth_id username@auth.id.domain
+-deliver_firsttime
+XX
+1
+x@y
+
+dddP Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtpa (Exim x.yz)
+	id 10HmbA-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+dddF From: username@auth.id.domain
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+10HmbB-0005vi-00-H
+CALLER UID GID
+<>
+ddddddddd 0
+-helo_name rhu.barb
+-host_address 127.0.0.1.9999
+-host_auth au1
+-interface_address 127.0.0.1.1225
+-received_protocol esmtpa
+-body_linecount 0
+-auth_id username@auth.id.domain
+-deliver_firsttime
+XX
+1
+x@y
+
+dddP Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtpa (Exim x.yz)
+	id 10HmbB-0005vi-00
+	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+dddF From: abc@x.y.z
+047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+dddS Sender: username@auth.id.domain
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/3450 b/test/stdout/3450
new file mode 100644
index 000000000..04dd751a8
--- /dev/null
+++ b/test/stdout/3450
@@ -0,0 +1,80 @@
+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 foobar
+??? 250-
+<<< 250-myhost.test.ex Hello foobar [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> auth plain AHVzZXJ4AHNlY3JldA==
+??? 235
+<<< 235 Authentication succeeded
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo foobar
+??? 250-
+<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> auth plain AHVzZXJ4AHNlY3JldA==
+??? 503
+<<< 503 STARTTLS required before AUTH
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server key exchange A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using DHE-RSA-AES256-SHA
+Succeeded in starting TLS
+>>> ehlo foobar
+??? 250-
+<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250
+<<< 250 HELP
+>>> auth plain AHVzZXJ4AHNlY3JldA==
+??? 235
+<<< 235 Authentication succeeded
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/3453 b/test/stdout/3453
new file mode 100644
index 000000000..e2186de39
--- /dev/null
+++ b/test/stdout/3453
@@ -0,0 +1,62 @@
+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 foobar
+??? 250-
+<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> auth plain AHVzZXJ4AHNlY3JldA==
+??? 503
+<<< 503 AUTH command used when not advertised
+>>> mail from:<x@y> size=1234
+??? 501
+<<< 501 <x@y> size=1234: malformed address: size=1234 may not follow <x@y> 
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo foobar
+??? 250-
+<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> auth plain AHVzZXJ4AHNlY3JldA==
+??? 235
+<<< 235 Authentication succeeded
+>>> mail from:<x@y> size=1234
+??? 250
+<<< 250 OK
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/3460 b/test/stdout/3460
new file mode 100644
index 000000000..42958057c
--- /dev/null
+++ b/test/stdout/3460
@@ -0,0 +1,79 @@
+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 foobar
+??? 250-
+<<< 250-myhost.test.ex Hello foobar [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> auth plain AHVzZXJ4AHNlY3JldA==
+??? 235
+<<< 235 Authentication succeeded
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo foobar
+??? 250-
+<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> auth plain AHVzZXJ4AHNlY3JldA==
+??? 503
+<<< 503 STARTTLS required before AUTH
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> ehlo foobar
+??? 250-
+<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250
+<<< 250 HELP
+>>> auth plain AHVzZXJ4AHNlY3JldA==
+??? 235
+<<< 235 Authentication succeeded
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/3463 b/test/stdout/3463
new file mode 100644
index 000000000..0a9526564
--- /dev/null
+++ b/test/stdout/3463
@@ -0,0 +1,90 @@
+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 foobar
+??? 250-
+<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> auth plain AHVzZXJ4AHNlY3JldA==
+??? 503
+<<< 503 AUTH command used when not advertised
+>>> mail from:<x@y> size=1234
+??? 501
+<<< 501 <x@y> size=1234: malformed address: size=1234 may not follow <x@y> 
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> ehlo foobar
+??? 250-
+<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+SSL info: before/connect initialization
+SSL info: before/connect initialization
+SSL info: SSLv2/v3 write client hello A
+SSL info: SSLv3 read server hello A
+SSL info: SSLv3 read server certificate A
+SSL info: SSLv3 read server done A
+SSL info: SSLv3 write client key exchange A
+SSL info: SSLv3 write change cipher spec A
+SSL info: SSLv3 write finished A
+SSL info: SSLv3 flush data
+SSL info: SSLv3 read finished A
+SSL info: SSL negotiation finished successfully
+SSL info: SSL negotiation finished successfully
+SSL connection using AES256-SHA
+Succeeded in starting TLS
+>>> auth plain AHVzZXJ4AHNlY3JldA==
+??? 235
+<<< 235 Authentication succeeded
+>>> mail from:<x@y> size=1234
+??? 250
+<<< 250 OK
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/3500 b/test/stdout/3500
new file mode 100644
index 000000000..deaae921b
--- /dev/null
+++ b/test/stdout/3500
@@ -0,0 +1,62 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH CRAM-MD5
+250 HELP
+334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+
+235 Authentication succeeded
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH CRAM-MD5
+250 HELP
+334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+
+235 Authentication succeeded
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 10.0.0.4
+**** 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-myhost.test.ex Hello test.host [10.0.0.4]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250 HELP
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 10.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-myhost.test.ex Hello test.host [10.0.0.1]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH CRAM-MD5
+250 HELP
+334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+
+235 Authentication succeeded
+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/3501 b/test/stdout/3501
new file mode 100644
index 000000000..e29d425ff
--- /dev/null
+++ b/test/stdout/3501
@@ -0,0 +1,32 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH CRAM-MD5
+AUTH CRAM-MD5
+334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+
+dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw
+235 Authentication successful
+MAIL FROM:<CALLER@myhost.test.ex> AUTH=CALLER@myhost.test.ex
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/3600 b/test/stdout/3600
new file mode 100644
index 000000000..a3f8001f5
--- /dev/null
+++ b/test/stdout/3600
@@ -0,0 +1,52 @@
+Message 10HmaY-0005vi-00 has been modified
+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 xxxx
+??? 250-
+<<< 250-myhost.test.ex Hello xxxx [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH NTLMX NTLM
+??? 250
+<<< 250 HELP
+>>> AUTH NTLM
+??? 334
+<<< 334 NTLM supported
+>>> teststring
+??? 535
+<<< 535 Incorrect authentication data
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+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
+>>> EHLO xxxx
+??? 250-
+<<< 250-myhost.test.ex Hello xxxx [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH NTLMX NTLM
+??? 250
+<<< 250 HELP
+>>> AUTH NTLM
+??? 334
+<<< 334 NTLM supported
+>>> dGVzdHN0cmluZw==
+??? 334
+<<< 334 TlRMTVNTUAACAAAAAAAAAAAoAAABggAAAEbBRwqFwwIAAAAAAAAAAAAt1sgAAAAA
+>>> teststring
+??? 535
+<<< 535 Incorrect authentication data
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/4000 b/test/stdout/4000
new file mode 100644
index 000000000..b9562b619
--- /dev/null
+++ b/test/stdout/4000
@@ -0,0 +1,68 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+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
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550-Your message has been rejected but is being kept for evaluation.
+550 If it was a legitimate message, it may still be delivered to the target recipient(s).
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+450-Your message has been rejected but is being kept for evaluation.
+450 If it was a legitimate message, it may still be delivered to the target recipient(s).
+221 myhost.test.ex closing connection
+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 Found Eicar-Test-Signature
+221 myhost.test.ex closing connection
diff --git a/test/stdout/4100 b/test/stdout/4100
new file mode 100644
index 000000000..1d3acd3e2
--- /dev/null
+++ b/test/stdout/4100
@@ -0,0 +1,26 @@
+Return-path copied from sender
+Sender      = CALLER@test.ex
+Recipient   = CALLER@test.ex
+Testing Exim filter file "TESTSUITE/aux-fixed/4100.f"
+
+Testprint: subject = >lots of leading and trailing space<
+Testprint: raw subject = >       lots of leading and trailing space         \n<
+Testprint: to = >a@b,\nc@d<
+Testprint: raw to = >    a@b\n    c@d\n<
+Testprint: rX-8: > (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)\n<
+Testprint: bX-8: >(\355\345\354\371 \357\341 \351\354\350\364\360)<
+Testprint:  X-8: >(\355\345\354\371 \357\341 \351\354\350\364\360)<
+Testprint: rX-9: > =?ISO-8859-1?Q?Patrik_F=E4ltstr=F6m?= <xxx>\n<
+Testprint: bX-9: >Patrik F\344ltstr\366m <xxx><
+Testprint:  X-9: >Patrik F\344ltstr\366m <xxx><
+Testprint: rX-10: > =?US-ASCII?Q?Keith_Moore?= <xxx>\n<
+Testprint: bX-10: >Keith Moore <xxx><
+Testprint:  X-10: >Keith Moore <xxx><
+Headers charset "UTF-8"
+Testprint:  X-8: >(\327\235\327\225\327\234\327\251 \327\237\327\221 \327\231\327\234\327\230\327\244\327\240)<
+Testprint:  X-9: >Patrik F\303\244ltstr\303\266m <xxx><
+Testprint:  X-10: >Keith Moore <xxx><
+Headers charset "ISO-8859-1//IGNORE"
+Testprint:  X-8: >(  )<
+Filtering did not set up a significant delivery.
+Normal delivery will occur.
diff --git a/test/stdout/4950 b/test/stdout/4950
new file mode 100644
index 000000000..57148e8b4
--- /dev/null
+++ b/test/stdout/4950
@@ -0,0 +1,18 @@
+userx@black-1.test.ex
+  router = lookuphost, transport = smtp
+  host black-1.test.ex [1.2.3.4] 
+userx@myhost.test.ex
+  router = lookuphost, transport = smtp
+  host myhost.test.ex [V4NET.10.10.11] 
+userx@ten-1.test.ex
+  router = lookuphost, transport = smtp
+  host other2.test.ex [V4NET.12.3.1] 
+  host other2.test.ex [V4NET.12.3.2] 
+userx@other1.test.ex
+  router = lookuphost, transport = smtp
+  host other1.test.ex [V4NET.12.4.5] 
+userx@other99.test.ex cannot be resolved at this time:
+  host non-exist.test.ex not found when translating other99.test.ex [V4NET.99.0.1]
+userx@other99.test.ex
+  router = lookuphost, transport = smtp
+  host non-exist.test.ex [unknown] 
diff --git a/test/stdout/5100 b/test/stdout/5100
new file mode 100644
index 000000000..b7255ca2e
--- /dev/null
+++ b/test/stdout/5100
@@ -0,0 +1,5 @@
++++++++++++++++++++++++++++
+  T:jack@myhost.test.ex -1 0 LMTP error after end of data: 450 Number 2 is now delayed
+first failed = time last try = time2 next try = time2 + 0
+  T:tom@myhost.test.ex -44 12800 LMTP error after RCPT TO:<tom@myhost.test.ex>: 450 This one is delayed on RCPT
+first failed = time last try = time2 next try = time2 + 60
diff --git a/test/stdout/5102 b/test/stdout/5102
new file mode 100644
index 000000000..372019227
--- /dev/null
+++ b/test/stdout/5102
@@ -0,0 +1,84 @@
+
+******** SERVER ********
+Listening on TESTSUITE/test.socket ... 
+Connection request
+220
+LHLO myhost.test.ex
+220 OK
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<userx@myhost.test.ex>
+250 OK
+DATA
+334 send more
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a test message.
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on TESTSUITE/test.socket ... 
+Connection request
+*sleep 3
+End of script
+Listening on TESTSUITE/test.socket ... 
+Connection request
+440 Sorry, there's a problem here
+End of script
+Listening on TESTSUITE/test.socket ... 
+Connection request
+220 Welcome to this LMTP simulation
+LHLO myhost.test.ex
+250-Hello there
+250 SIZE
+MAIL FROM:<CALLER@myhost.test.ex>
+550 Don't like that sender
+QUIT
+250 OK
+End of script
+Listening on TESTSUITE/test.socket ... 
+Connection request
+220 Welcome to this LMTP simulation
+LHLO myhost.test.ex
+250-Hello there
+250 SIZE
+MAIL FROM:<CALLER@myhost.test.ex>
+250 OK
+RCPT TO:<lp1@myhost.test.ex>
+250 OK
+RCPT TO:<lp2@myhost.test.ex>
+250 OK
+RCPT TO:<lp3@myhost.test.ex>
+250 OK
+RCPT TO:<lp4@myhost.test.ex>
+450 This one is delayed on RCPT
+RCPT TO:<lp5@myhost.test.ex>
+550 This one is unknown on RCPT
+RCPT TO:<lp6@myhost.test.ex>
+250 OK
+DATA
+354 Send it
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a test message
+.
+250 Number 1 is OK
+450 Number 2 is now delayed
+550 Number 3 is now rejected
+250 Number 6 is OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/5201 b/test/stdout/5201
new file mode 100644
index 000000000..5a1059de1
--- /dev/null
+++ b/test/stdout/5201
@@ -0,0 +1 @@
+Message 10HmaX-0005vi-00 is now frozen
diff --git a/test/stdout/5204 b/test/stdout/5204
new file mode 100644
index 000000000..df0810ede
--- /dev/null
+++ b/test/stdout/5204
@@ -0,0 +1,21 @@
+"ACCEPT hosts=localhost lookup=byname"@some.host cannot be resolved at this time:
+  remote host address is the local host
+"DECLINE cannot route this one (DECLINE)"@some.host is undeliverable:
+  Unrouteable address
+"FAIL cannot route this one (FAIL)"@some.host is undeliverable:
+  cannot route this one (FAIL)
+"ERROR cannot route this one (ERROR)"@some.host cannot be resolved at this time:
+  bad command yield: ERROR cannot route this one (ERROR)
+"DEFER cannot route this one (DEFER)"@some.host cannot be resolved at this time:
+  cannot route this one (DEFER)
+"ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
+  router = q, transport = other_smtp
+  host ten-1.test.ex [V4NET.0.0.1] 
+PASS@some.host
+  router = s, transport = smtp
+  host 127.0.0.1 [127.0.0.1] 
+"FREEZE cannot route this one (FREEZE)"@some.host cannot be resolved at this time:
+  cannot route this one (FREEZE)
+postmaster@test.ex
+    <-- "REDIRECT postmaster@test.ex"@some.host
+  router = pm, transport = null
diff --git a/test/stdout/5205 b/test/stdout/5205
new file mode 100644
index 000000000..8f7bc77dc
--- /dev/null
+++ b/test/stdout/5205
@@ -0,0 +1,2 @@
+userx@ten-3.test.ex cannot be resolved at this time:
+  lookup of host "ten-3.test.ex" failed in queryprogram router
diff --git a/test/stdout/5206 b/test/stdout/5206
new file mode 100644
index 000000000..8f7bc77dc
--- /dev/null
+++ b/test/stdout/5206
@@ -0,0 +1,2 @@
+userx@ten-3.test.ex cannot be resolved at this time:
+  lookup of host "ten-3.test.ex" failed in queryprogram router
diff --git a/test/stdout/5208 b/test/stdout/5208
new file mode 100644
index 000000000..493025aba
--- /dev/null
+++ b/test/stdout/5208
@@ -0,0 +1,4 @@
+x@query.program
+  router = r1, transport = t1
+  host ten-2.test.ex [V4NET.0.0.2] MX=5
+  host ten-3.test.ex [V4NET.0.0.3] MX=6
diff --git a/test/stdout/5209 b/test/stdout/5209
new file mode 100644
index 000000000..6c7156e92
--- /dev/null
+++ b/test/stdout/5209
@@ -0,0 +1,2 @@
+x@y is undeliverable:
+  67890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C234567890D234567890E234567890F234567890G234567890H234567890I234567890J234567890K234567890L234567890M234567890N234567890O234567890P234567890Q234567890R234567890S234567890T234567890U234567890V234567890W234567890X234567890Y234567890a234567890b234567890c234567890d234567890e234567890f234567890g234567890h234567890i234567890j234567890k234567890l234567890m234567890n234567890o234567890p234567890q234567890r234567890s234567890t234567890u234567890v234567890w234567890x234567890y234567890A234567890B234567890C23
diff --git a/test/stdout/5300 b/test/stdout/5300
new file mode 100644
index 000000000..e2f83ccb3
--- /dev/null
+++ b/test/stdout/5300
@@ -0,0 +1,13 @@
+x@[V4NET.9.8.7]
+  router = r1, transport = t1
+  host [V4NET.9.8.7] [V4NET.9.8.7] 
+x@[127.0.0.1]
+  router = r3, transport = t1
+ 0m   sss 10HmaX-0005vi-00 <y@[10.9.8.7]>
+          zz@test.ex
+
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+250 Accepted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/5301 b/test/stdout/5301
new file mode 100644
index 000000000..77c6fc727
--- /dev/null
+++ b/test/stdout/5301
@@ -0,0 +1,15 @@
+x@[abcd::dcba]
+  router = r0, transport = t1
+  host [abcd::dcba] [abcd::dcba] 
+x@[IPv6:cba::abc]
+  router = r0, transport = t1
+  host [ipv6:cba::abc] [cba::abc] 
+x@[abcd::dcba]
+  router = r3, transport = t1
+x@[IPv6:cba::abc]
+  router = r3, transport = t1
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+250 Accepted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/9000 b/test/stdout/9000
new file mode 100644
index 000000000..cfd0c2102
--- /dev/null
+++ b/test/stdout/9000
@@ -0,0 +1,179 @@
+> Expect "Hazel"
+> ${lookup ldap {ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=Philip%20Hazel)}{$value}fail}
+> Hazel
+> 
+> DN is: cn=Philip Hazel,o=University of Cambridge,c=UK
+> 
+> Expect "Hazel" (Unix socket interface)
+> ${lookup ldap {ldapi://%2Ftmp%2Fldap.sock/o=University%20of%20Cambridge,c=UK?sn?sub?(cn=Philip%20Hazel)}{}fail}
+> Hazel
+> 
+> Expect syntax failure
+> Failed: lookup of "X=y ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=Philip%20Hazel)" gave DEFER: unknown parameter "X=" precedes LDAP URL
+> 
+> Expect "Hazel"
+> ${lookup ldap {time=1 ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=Philip%20Hazel)}{$value}fail}
+> Hazel
+> 
+> Expect "manager" followed by "Hazel" 5 times
+> ${lookup ldapm {ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{$value}fail}
+> manager
+Hazel
+Hazel
+Hazel
+Hazel
+Hazel
+> 
+> DN is: cn=P*Hazel,o=University of Cambridge,c=UK
+> 
+> Expect  "manager" followed by "Hazel"
+> ${lookup ldapm {Size=2 ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{$value}fail}
+> manager
+Hazel
+> 
+> Expect "manager" followed by "Hazel" 5 times
+> ${lookup ldapm {ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{$value}fail}
+> manager
+Hazel
+Hazel
+Hazel
+Hazel
+Hazel
+> 
+> Expect "manager"
+> ${lookup ldap {size=1 ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{$value}fail}
+> manager
+> 
+> Expect too many results error
+> Failed: lookup of "size=0 time=0 ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)" gave DEFER: LDAP search: more than one entry (6) was returned (filter not specific enough?)
+> 
+> Expect "manager"
+> ${lookup ldap {size=1 time=0 user="cn=manager,o=University of Cambridge,c=UK" pass=secret ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{$value}fail}
+> manager
+> 
+> Expect invalid credentials
+> ${lookup ldap {size=1 time=0 user="cn=manager,o=University of Cambridge,c=UK" pass=known ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{$value}fail}
+> Failed: lookup of "size=1 time=0 user="cn=manager,o=University of Cambridge,c=UK" pass=known ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)" gave DEFER: failed to bind the LDAP connection to server NULL:389 - LDAP error 49: Invalid credentials
+> 
+> cn="Philip Hazel" sn=Hazel
+> ${lookup ldap {ldap:///o=University%20of%20Cambridge,c=UK?sn,cn?sub?(cn=Philip%20Hazel)}{$value}fail}
+> cn="Philip Hazel" sn="Hazel"
+> 
+> cn="Philip Hazel" sn=Hazel objectClass=person
+> ${lookup ldap {ldap:///o=University%20of%20Cambridge,c=UK??sub?(cn=Philip%20Hazel)}{$value}fail}
+> cn="Philip Hazel" sn="Hazel" objectClass="person"
+> 
+> P Hazel, Phil Hazel
+> ${lookup ldapm {ldap:///o=University%20of%20Cambridge,c=UK?cn?sub?(cn=Phil%20Hazel)}{$value}fail}
+> P Hazel, Phil Hazel
+P Hazel, Phil Hazel
+> 
+> cn="P Hazel" cn="Phil Hazel" sn=Hazel objectClass=person
+> ${lookup ldapm {ldap:///o=University%20of%20Cambridge,c=UK??sub?(cn=Phil%20Hazel)}{$value}fail}
+> cn="P Hazel, Phil Hazel" sn="Hazel" objectClass="person"
+cn="P Hazel, Phil Hazel" sn="Hazel" objectClass="person"
+> 
+> cn=P Hazel, o=University of Cambridge, c=UK
+> ${lookup ldapdn {ldap:///o=University%20of%20Cambridge,c=UK??sub?(cn=manager)}{$value}fail}
+> cn=manager,o=University of Cambridge,c=UK
+> 
+> Expect too many results error
+> Failed: lookup of "ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)" gave DEFER: LDAP search: more than one entry (6) was returned (filter not specific enough?)
+> 
+> Expect "yes"
+> ${if ldapauth {size=1 time=0 user="cn=manager,o=University of Cambridge,c=UK" pass=secret ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{yes}{no}}
+> yes
+> 
+> Expect "no"
+> ${if ldapauth {size=1 time=0 user="cn=manager,o=University of Cambridge,c=UK" pass=known ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{yes}{no}}
+> no
+> 
+> Expect "no"
+> ${if ldapauth {size=1 time=0 user="cn=manager,o=University of Cambridge,c=UK" pass= ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{yes}{no}}
+> no
+> 
+> Expect "no"
+> ${if ldapauth {size=1 time=0 user="cn=manager,o=University of Cambridge,c=UK" pass=known ldaps://127.0.0.1/o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{yes}{no}}
+> no
+> 
+> Expect failure to contact server
+> ${if ldapauth {size=1 time=0 user="cn=manager,o=University of Cambridge,c=UK" pass=known ldaps://127.0.0.1:9999/o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{yes}{no}}
+> Failed: failed to bind the LDAP connection to server 127.0.0.1:9999 - ldap_bind() returned -1
+> 
+> Expect "yes"
+> ${if ldapauth { size=1 time=0 user="cn=manager,o=University of Cambridge,c=UK" pass=secret ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{yes}{no}}
+> yes
+> 
+> Expect "yes"
+> ${if ldapauth { size=1 time=0 user=cn%3dmanager%2co%3DUniversity%20of%20Cambridge%2Cc%3dUK pass=secret ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{yes}{no}}
+> yes
+> 
+> Expect syntax error
+> ${lookup ldap {ldapz:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=Philip%20Hazel)}{}fail}
+> Failed: lookup of "ldapz:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=Philip%20Hazel)" gave DEFER: LDAP URL does not start with "ldap://", "ldaps://", or "ldapi://" (it starts with "ldapz:///o=Unive...")
+> 
+> Expect error for missing user
+> ${if ldapauth {size=1 time=0 pass=secret ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{yes}{no}}
+> Failed: ldapauth lookups must specify the username and password
+> 
+> Expect error for missing password
+> ${if ldapauth {size=1 time=0 user="cn=manager,o=University of Cambridge,c=UK" ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{yes}{no}}
+> Failed: ldapauth lookups must specify the username and password
+> 
+> Expect "no" because of empty password
+> ${if ldapauth {size=1 time=0 user="cn=manager,o=University of Cambridge,c=UK" pass="" ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{yes}{no}}
+> no
+> 
+> Expect "FAILED" because no such object
+> ${lookup ldap {ldap:///o=JUNK}{}{FAILED}}
+> FAILED
+> 
+> Expect "P*Hazel (starry)"
+> ${lookup ldap {ldap:///o=University%20of%20Cambridge,c=UK?cn?sub?(cn=P%5C2AHazel*)}{$value}fail}
+> P*Hazel
+> 
+> DN is: cn=P*Hazel,o=University of Cambridge,c=UK
+> 
+> Expect "P,Hazel"
+> ${lookup ldap {ldap:///cn=P%5C%2CHazel,o=University%20of%20Cambridge,c=UK?cn?sub?(cn=*)}{$value}fail}
+> P,Hazel
+> 
+> Expect syntax error
+> ${if ldapauth { soze=1 time=0 user="cn=manager,o=University of Cambridge,c=UK" pass=secret ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{yes}{no}}
+> Failed: unknown parameter "soze=" precedes LDAP URL
+> 
+> Expect syntax error
+> ${if ldapauth { size=1 time=0 user"cn=manager,o=University of Cambridge,c=UK" pass=secret ldap:///o=University%20of%20Cambridge,c=UK?sn?sub?(cn=*)}{yes}{no}}
+> Failed: unknown parameter "user"cn=" precedes LDAP URL
+> 
+> Expect 5 x "Hazel"
+> Hazel
+> Hazel
+> Hazel
+> Hazel
+> Hazel
+> 
+> Expect 2 x "Hazel" (using ldaps)
+> ${lookup ldap {user="cn=manager,o=University of Cambridge,c=UK" pass=secret ldaps://127.0.0.1/o=University%20of%20Cambridge,c=UK?sn?sub?(cn=Philip%20Hazel)}{}fail}
+> Hazel
+> Hazel
+> 
+> Expect 2 x "Hazel"
+> Hazel
+> Hazel
+> 
+> Expect 3 x "Hazel"
+> Hazel
+> Hazel
+> Hazel
+> 
+> Expect errors
+> ${lookup ldap {ldapi://127.0.0.1/o=University%20of%20Cambridge,c=UK?sn?sub?(cn=Philip%20Hazel)}{}fail}
+> Failed: lookup of "ldapi://127.0.0.1/o=University%20of%20Cambridge,c=UK?sn?sub?(cn=Philip%20Hazel)" gave DEFER: ldapi requires an absolute path ("127.0.0.1" given)
+> 
+> ${lookup ldap {user="cn=manager,o=University of Cambridge,c=UK" pass="se"cret" ldaps://127.0.0.1/o=University%20of%20Cambridge,c=UK?sn?sub?(cn=Philip%20Hazel)}{}fail}
+> Failed: lookup of "user="cn=manager,o=University of Cambridge,c=UK" pass="se\"cret" ldaps://127.0.0.1/o=University%20of%20Cambridge,c=UK?sn?sub?(cn=Philip%20Hazel)" gave DEFER: failed to bind the LDAP connection to server 127.0.0.1:636 - LDAP error 49: Invalid credentials
+> 
+> Expect ldap_search to fail
+> Failed: lookup of "ldap:///o=top?mailRoutingAddress,mailHost,objectClass?sub?(&(mailLocalAddress=3-1546081-domain.net?wendling@stderr.efficientimpacte.com)(objectClass=inetLocalMailRecipient))" gave DEFER: ldap_search failed: -7, Bad search filter
+> 
diff --git a/test/stdout/9100 b/test/stdout/9100
new file mode 100644
index 000000000..8ef63f6fe
--- /dev/null
+++ b/test/stdout/9100
@@ -0,0 +1,22 @@
+> Philip Hazel
+> Philip Hazel
+> 
+> 
+> id=nothing name="" 
+> 0
+> id=quote name="\"Q\" Oted" home=/home/quoted mail=quoted@xxx 
+> id=filter name=filter home=filter mail="#Exim filter
+deliver postmaster" 
+> id=quote2 name="\"qnosp" home=/home/q2 mail="" 
+> id=nlonly name=filter home=filter mail="Before
+After" 
+> 
+
+**** SMTP testing session as if from host 10.0.0.0
+**** 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 relay not permitted
+221 myhost.test.ex closing connection
diff --git a/test/stdout/9200 b/test/stdout/9200
new file mode 100644
index 000000000..833f670ce
--- /dev/null
+++ b/test/stdout/9200
@@ -0,0 +1,23 @@
+> Philip Hazel
+> Philip Hazel
+> 
+> 
+> id=nothing name="" 
+> 0
+> name="\"stquot" id=quote2 
+> name="before
+after" id=newline 
+> name="x	x" id=tab 
+> 
+
+**** SMTP testing session as if from host 10.0.0.0
+**** 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 relay not permitted
+550 relay not permitted
+221 myhost.test.ex closing connection
+> Philip Hazel
+> 
diff --git a/test/stdout/9300 b/test/stdout/9300
new file mode 100644
index 000000000..b9e6b6d54
--- /dev/null
+++ b/test/stdout/9300
@@ -0,0 +1,27 @@
+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 xxxx
+??? 250-
+<<< 250-myhost.test.ex Hello xxxx [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH ANONYMOUS PLAIN
+??? 250
+<<< 250 HELP
+>>> AUTH PLAIN AHBoMTAAc2VjcmV0
+??? 535
+<<< 535 Incorrect authentication data
+>>> AUTH ANONYMOUS
+??? 334
+<<< 334 
+>>> CALLER
+??? 235
+<<< 235 Authentication succeeded
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
diff --git a/test/stdout/9400 b/test/stdout/9400
new file mode 100644
index 000000000..93e882c57
--- /dev/null
+++ b/test/stdout/9400
@@ -0,0 +1,238 @@
+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=10HmbM-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmbN-0005vi-00
+221 myhost.test.ex closing connection
+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
+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 this message isn't wanted
+221 myhost.test.ex closing connection
+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-this message isn't wanted
+550 and we tell it on two lines
+221 myhost.test.ex closing connection
+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
+451 Temporary local problem
+221 myhost.test.ex closing connection
+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
+451 this message isn't wanted just now
+221 myhost.test.ex closing connection
+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=10HmbO-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmbP-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmbQ-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmbT-0005vi-00
+221 myhost.test.ex closing connection
+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
+421 myhost.test.ex local verification problem - closing connection.
+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=10HmbU-0005vi-00
+221 myhost.test.ex closing connection
+550 not wanted -bS
+
+Transaction started in line 0
+Error detected in line 7
+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=10HmbW-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmbX-0005vi-00
+221 myhost.test.ex closing connection
+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 myhost.test.ex closing connection
+550 not wanted -bS
+
+Transaction started in line 0
+Error detected in line 7
+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
+451 Temporary local problem
+221 myhost.test.ex closing connection
+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=10HmbY-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbZ-0005vi-00
+221 myhost.test.ex closing connection
+local_scan_int = 24
+local_scan_string = the quick brown fox
+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=10HmcA-0005vi-00
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmcB-0005vi-00
+221 myhost.test.ex closing connection
+ 0m   sss 10HmcA-0005vi-00 <test-local-scan@y> *** frozen ***
+          userx@test.ex
+
+ 0m   sss 10HmcB-0005vi-00 <test-local-scan@y>
+          userx@test.ex
+
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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=10HmcL-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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=10HmcM-0005vi-00
+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection
+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
+421 myhost.test.ex local verification problem - closing connection.
+10HmcA-0005vi-00-D
+10HmcA-0005vi-00-H
+10HmcB-0005vi-00-D
+10HmcB-0005vi-00-H
+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=10HmcC-0005vi-00
+221 myhost.test.ex closing connection
+ 0m   sss 10HmcA-0005vi-00 <test-local-scan@y> *** frozen ***
+          userx@test.ex
+
+ 0m   sss 10HmcB-0005vi-00 <test-local-scan@y>
+          userx@test.ex
+
+ 0m   sss 10HmcC-0005vi-00 <test-local-scan@y>
+          unqualified@myhost.test.ex
+
+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=10HmcD-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmcE-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmcF-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmcG-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmcH-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmcI-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmcJ-0005vi-00
+221 myhost.test.ex closing connection
+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=10HmcK-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/9401 b/test/stdout/9401
new file mode 100644
index 000000000..20f75f9c8
--- /dev/null
+++ b/test/stdout/9401
@@ -0,0 +1,4 @@
+10HmaX-0005vi-00-H
+-local_scan This is text for the local scan returned header   and I am going to make sure that it is quite long 
+10HmaY-0005vi-00-H
+-local
diff --git a/test/stdout/9402 b/test/stdout/9402
new file mode 100644
index 000000000..d2b9c7381
--- /dev/null
+++ b/test/stdout/9402
@@ -0,0 +1,41 @@
+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 foobar
+??? 250-
+<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<test-local-scan@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> local-scan: reject rhubarb rhubarb
+>>> .
+??? 550
+<<< 550 rhubarb rhubarb
+>>> mail from:<test-local-scan@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> local-scan: teergrube
+>>> .
+??? 550-
+<<< 550-holding...
+??? 550-
+<<< 550-holding...
+End of script
diff --git a/test/stdout/9450 b/test/stdout/9450
new file mode 100644
index 000000000..e039dabcb
--- /dev/null
+++ b/test/stdout/9450
@@ -0,0 +1 @@
+mail to alias@myhost.test.ex is discarded
diff --git a/test/stdout/9900 b/test/stdout/9900
new file mode 100644
index 000000000..fdbda6cc6
--- /dev/null
+++ b/test/stdout/9900
@@ -0,0 +1,2 @@
+userx@eximtesthost.ipv6.test.ex cannot be resolved at this time:
+  lookup of host "eximtesthost.ipv6.test.ex" failed in lookuphost router
diff --git a/test/stdout/9901 b/test/stdout/9901
new file mode 100644
index 000000000..4402033eb
--- /dev/null
+++ b/test/stdout/9901
@@ -0,0 +1,6 @@
+Message 10HmaY-0005vi-00 has been modified
++++++++++++++++++++++++++++
+  T:127.0.0.1:127.0.0.1:1225:10HmaY-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex> SIZE=ssss: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - cl
+first failed = time last try = time2 next try = time2 + 600
+  R:2.test.again.dns -1 0 host lookup did not complete
+first failed = time last try = time2 next try = time2 + 600
diff --git a/test/stdout/9902 b/test/stdout/9902
new file mode 100644
index 000000000..97b1a85ef
--- /dev/null
+++ b/test/stdout/9902
@@ -0,0 +1,28 @@
+
+**** SMTP testing session as if from host V4NET.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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host V4NET.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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+221 myhost.test.ex closing connection
+
+**** SMTP testing session as if from host 1.2.3.4
+**** 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
+221 myhost.test.ex closing connection