utf8 recipient

diff --git a/src/src/exim.c b/src/src/exim.c
index 424806012cd35b0498ff3839e8bbfdff3a1292af..cae2964775ee8593f5774e9772d4b4c880f08d96 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1022,6 +1022,9 @@ DEBUG(D_any) do {
 #ifdef SUPPORT_TLS
   tls_version_report(f);
 #endif
+#ifdef EXPERIMENTAL_INTERNATIONAL
+  utf8_version_report(f);
+#endif
 
   for (authi = auths_available; *authi->driver_name != '\0'; ++authi) {
     if (authi->version_report) {

diff --git a/src/src/utf8.c b/src/src/utf8.c
index 32d2eaed043080fd9e8322ab05d1a60eb037fb2a..611bff02050ecc233e7a0df9459763a1ba1b08d0 100644 (file)
--- a/src/src/utf8.c
+++ b/src/src/utf8.c
@@ -125,6 +125,25 @@ return res;
 }
 
 
+/*************************************************
+*         Report the library versions.           *
+*************************************************/
+
+/* See a description in tls-openssl.c for an explanation of why this exists.
+
+Arguments:   a FILE* to print the results to
+Returns:     nothing
+*/
+
+void
+utf8_version_report(FILE *f)
+{
+fprintf(f, "Library version: IDN: Compile: %s\n"
+           "                      Runtime: %s\n",
+       STRINGPREP_VERSION,
+       stringprep_check_version(NULL));
+}
+
 #endif /* whole file */
 
 /* vi: aw ai sw=2

diff --git a/test/log/4201 b/test/log/4201
index 6d8260be15bdfa361ea1b6d1e224b3b8195502ad..467bb6c94e8851d5f531f2ce8ed3d836e9e428f7 100644 (file)
--- a/test/log/4201
+++ b/test/log/4201
@@ -42,3 +42,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 U=CALLER F=<CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> rejected RCPT <userS@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
 1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: response to "EHLO the.local.host.name" from 127.0.0.1 [127.0.0.1] did not include SMTPUTF8
+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 10HmbH-0005vi-00 <= userU@test.ex U=CALLER P=utf8local-esmtp S=sss for user.γλυκύρριζα@test.ex
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= userU@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmbH-0005vi-00@the.local.host.name for user.γλυκύρριζα@test.ex
+1999-03-02 09:44:33 10HmbH-0005vi-00 => user.γλυκύρριζα@test.ex F=<userU@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbI-0005vi-00"
+1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
+1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
+1999-03-02 09:44:33 10HmbI-0005vi-00 => :blackhole: <user.γλυκύρριζα@test.ex> R=localuser
+1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qqff

diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index a697764f58f7c2a7c04c741010b9e058fc11be1e..c984f1c347157907531e587fbdaecaac9303397e 100644 (file)
--- a/test/scripts/4200-International/4201
+++ b/test/scripts/4200-International/4201
@@ -161,3 +161,30 @@ QUIT
 #
 killdaemon
 #
+#
+#
+#
+#
+#
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+#
+# utf-8 to, -bs input and forwarding
+exim -bs -odi
+EHLO client.bh
+MAIL FROM: <userU@test.ex> SMTPUTF8
+RCPT TO: <user.γλυκύρριζα@test.ex>
+DATA
+Subject: test
+
+body
+.
+QUIT
+****
+#
+killdaemon
+exim -DSERVER=server -qqff
+****
+#
+#

diff --git a/test/stdout/4201 b/test/stdout/4201
index 937824322288c2d6fb502a57627376b75dc3602a..9cc30f216d815c6c9f16623ba9c8dedcda8f37e9 100644 (file)
--- a/test/stdout/4201
+++ b/test/stdout/4201
@@ -136,3 +136,15 @@ End of script
 250 OK\r
 533 mailbox name not allowed\r
 221 the.local.host.name closing connection\r
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250-the.local.host.name Hello CALLER at client.bh\r
+250-SIZE 52428800\r
+250-8BITMIME\r
+250-PIPELINING\r
+250-SMTPUTF8\r
+250 HELP\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbH-0005vi-00\r
+221 the.local.host.name closing connection\r