Permit underbar in dns name component; needed for srv, csa, dane...

diff --git a/src/src/dns.c b/src/src/dns.c
index f1619f4a464122f46445c98aaf058891f0061dbb..6f75386ed528c23236b2953584de4c4247e127b2 100644 (file)
--- a/src/src/dns.c
+++ b/src/src/dns.c
@@ -584,7 +584,7 @@ if (previous != NULL)
   if ((alabel = string_domain_utf8_to_alabel(name, &errstr)), errstr)
     {
     DEBUG(D_dns)
-      debug_printf("DNS name '%s' utf8 conversion to alabel failed: %s", name,
+      debug_printf("DNS name '%s' utf8 conversion to alabel failed: %s\n", name,
         errstr);
     host_find_failed_syntax = TRUE;
     return DNS_NOMATCH;

diff --git a/src/src/utf8.c b/src/src/utf8.c
index 611bff02050ecc233e7a0df9459763a1ba1b08d0..6d0c5029b511ea42752b9161062ed62ddaf6410a 100644 (file)
--- a/src/src/utf8.c
+++ b/src/src/utf8.c
@@ -33,7 +33,7 @@ uschar * s;
 int rc;
 
 s = US stringprep_utf8_nfkc_normalize(CCS utf8, -1);
-if (  (rc = idna_to_ascii_8z(CCS s, CSS &s1, IDNA_USE_STD3_ASCII_RULES))
+if (  (rc = idna_to_ascii_8z(CCS s, CSS &s1, IDNA_ALLOW_UNASSIGNED))
    != IDNA_SUCCESS)
   {
   free(s);