DNS lookups never use UTF-8

diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt
index 79b21fe397a91cf157f0ff47296829acf1d1822c..3dbf13f9da71910a2d9a847480cba19049b958d3 100644 (file)
--- a/doc/doc-txt/experimental-spec.txt
+++ b/doc/doc-txt/experimental-spec.txt
@@ -1288,7 +1288,8 @@ international handling for the message is enabled and
 the expansion variable $message_smtputf8 will have value TRUE.
 
 The option allow_utf8_domains is set to true for this
 the expansion variable $message_smtputf8 will have value TRUE.
 
 The option allow_utf8_domains is set to true for this

-message, but all DNS lookups are converted to a-label form.
+message. All DNS lookups are converted to a-label form
+whatever the setting of allow_utf8_domains.

 
 Log lines and Received-by: header lines will aquire a "utf8"
 prefix on the protocol element, eg. utf8esmtp.
 
 Log lines and Received-by: header lines will aquire a "utf8"
 prefix on the protocol element, eg. utf8esmtp.

diff --git a/test/dnszones-src/db.test.ex b/test/dnszones-src/db.test.ex
index fec2a0d781c96a7d000f9cbd91548b6ad1dc9cef..ebf9a4021b74475801b25b2bc3dc65330b9c13ad 100644 (file)
--- a/test/dnszones-src/db.test.ex
+++ b/test/dnszones-src/db.test.ex
@@ -38,9 +38,9 @@ dontqualify  A       V4NET.255.255.254
 
 UpperCase    A       127.0.0.1
 
 
 UpperCase    A       127.0.0.1
 

-; A host with UTF-8 characters in its name
+; A host with UTF-8 characters used for its lookup ( π.test.ex )

 
 

-mx.π        A       V4NET.255.255.255
+mx.xn--1xa   A       V4NET.255.255.255

 
 ; A non-standard name for localhost
 
 
 ; A non-standard name for localhost
 


@@ -358,9 +358,9 @@ mxt97        MX  1  ten-1.test.ex.
 
 mxt1c        MX  1  dontqualify.
 
 
 mxt1c        MX  1  dontqualify.
 

-; MX with UTF-8 characters in its name
+; MX with UTF-8 characters used for its lookup ( π.test.ex )

 
 

-π           MX  0  mx.π.test.ex.
+xn--1xa      MX  0  mx.xn--1xa.test.ex.

 
 ; -------- Testing SRV records --------
 
 
 ; -------- Testing SRV records --------
 

diff --git a/test/stdout/0405 b/test/stdout/0405
index 6b561f74ff527445788dc4809b026b2dc8d449bd..f5b5dce4143601f4df8578faad5f27bfd6a0e2c0 100644 (file)
--- a/test/stdout/0405
+++ b/test/stdout/0405
@@ -1,4 +1,5 @@
 syntax error: domain missing or malformed
 syntax error: domain missing or malformed

-bounce@π.test.ex
+bounce@xn--1xa.test.ex
+    <-- bounce@π.test.ex

   router = r1, transport = t1
   router = r1, transport = t1

-  host mx.π.test.ex [V4NET.255.255.255] MX=0
+  host mx.xn--1xa.test.ex [V4NET.255.255.255] MX=0