smtp output, no remote support

4 files changed, 51 insertions, 1 deletions

diff --git a/test/confs/4201 b/test/confs/4201
index 3b87cd5fc..36e38bcd5 100644
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -1,4 +1,7 @@
 # Exim test configuration 4201
+# SMTPUTF8 handling
+
+OPTION = *
 
 exim_path = EXIM_PATH
 host_lookup_order = bydns
@@ -20,7 +23,7 @@ queue_only
 queue_run_in_order
 .endif
 
-smtputf8_advertise_hosts = *
+smtputf8_advertise_hosts = OPTION
 
 
 # ----- ACL -----
@@ -28,6 +31,10 @@ smtputf8_advertise_hosts = *
 begin acl
 
 check_recipient:
+
+.ifndef SERVER
+  accept domains = *
+.endif
   accept hosts = :
   accept domains = +local_domains
   deny   message = relay not permitted
@@ -51,10 +58,15 @@ localuser:
 
 rmt:
   driver = manualroute
+  domains = +local_domains
   route_data = <;[127.0.0.1]:PORT_D
   transport = rmt_smtp
   self = send
 
+hole:
+  driver = redirect
+  data = :blackhole:
+
 .endif
 
 # ----- Transports -----
diff --git a/test/log/4201 b/test/log/4201
index ebc09936a..7bd340b59 100644
--- a/test/log/4201
+++ b/test/log/4201
@@ -5,6 +5,13 @@
 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 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.com U=CALLER P=utf8local-esmtp S=sss for userz@test.ex
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** userz@test.ex R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1]: utf8 support required for forwarding
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.com
+1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.com> R=hole
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbB-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
diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index 1bb978634..17b97c7e6 100644
--- a/test/scripts/4200-International/4201
+++ b/test/scripts/4200-International/4201
@@ -73,6 +73,25 @@ QUIT
 #
 #
 killdaemon
+exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
+****
+#
+# forwarding fails when target does not support SMTPUTF8
+exim -bs -odi
+EHLO client.ffail
+MAIL FROM: <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.com> SMTPUTF8
+RCPT TO: <userz@test.ex>
+DATA
+Subject: test
+
+body
+.
+QUIT
+****
+#
+#
+#
+killdaemon
 exim -DSERVER=server -qq
 ****
 no_msglog_check
diff --git a/test/stdout/4201 b/test/stdout/4201
index 8b89b2bd3..e5f488632 100644
--- a/test/stdout/4201
+++ b/test/stdout/4201
@@ -80,3 +80,15 @@ End of script
 354 Enter message, ending with "." on a line by itself

 250 OK id=10HmaZ-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 client.ffail

+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=10HmbB-0005vi-00

+221 the.local.host.name closing connection