From 37bf366ed1fe8b579a2800b3593bc76294b3ecf2 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 11 Apr 2015 17:40:37 +0100
Subject: [PATCH] Permit underbar in dns name component; needed for srv, csa,
 dane...

---
 src/src/dns.c  | 2 +-
 src/src/utf8.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/src/dns.c b/src/src/dns.c
index f1619f4a4..6f75386ed 100644
--- 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 611bff020..6d0c5029b 100644
--- 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);
-- 
2.30.2