smtp output

4 files changed, 48 insertions, 1 deletions

diff --git a/test/confs/4201 b/test/confs/4201
index 7d9af4bf3..3b87cd5fc 100644
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -15,8 +15,10 @@ acl_smtp_rcpt = check_recipient
 trusted_users = CALLER
 log_selector = +received_recipients
 
+.ifdef SERVER
 queue_only
 queue_run_in_order
+.endif
 
 smtputf8_advertise_hosts = *
 
@@ -34,6 +36,8 @@ check_recipient:
 
 begin routers
 
+.ifdef SERVER
+
 fail_remote_domains:
   driver = redirect
   domains = ! +local_domains
@@ -43,6 +47,16 @@ localuser:
   driver = redirect
   data = :blackhole:
 
+.else
+
+rmt:
+  driver = manualroute
+  route_data = <;[127.0.0.1]:PORT_D
+  transport = rmt_smtp
+  self = send
+
+.endif
+
 # ----- Transports -----
 
 begin transports
@@ -57,4 +71,7 @@ local_delivery:
                  X-received-count: $received_count"
   return_path_add
 
+rmt_smtp:
+  driver = smtp
+
 # End
diff --git a/test/log/4201 b/test/log/4201
index 299952090..ebc09936a 100644
--- a/test/log/4201
+++ b/test/log/4201
@@ -1,9 +1,12 @@
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for usery@test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for usery@test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => usery@test.ex R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 Start queue run: pid=pppp -qq
 1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qq
diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index bac040f9b..1bb978634 100644
--- a/test/scripts/4200-International/4201
+++ b/test/scripts/4200-International/4201
@@ -57,6 +57,21 @@ QUIT
 ****
 #
 #
+# utf-8 from, -bs input and forwarding
+exim -bs -odi
+EHLO client.bh
+MAIL FROM: <他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> SMTPUTF8
+RCPT TO: <usery@test.ex>
+DATA
+Subject: test
+
+body
+.
+QUIT
+****
+#
+#
+#
 killdaemon
 exim -DSERVER=server -qq
 ****
diff --git a/test/stdout/4201 b/test/stdout/4201
index b37028d59..8b89b2bd3 100644
--- a/test/stdout/4201
+++ b/test/stdout/4201
@@ -68,3 +68,15 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 221
 <<< 221 the.local.host.name closing connection
 End of script
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250-the.local.host.name Hello CALLER at client.bh

+250-SIZE 52428800

+250-8BITMIME

+250-PIPELINING

+250-SMTPUTF8

+250 HELP

+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