When using libidn2, also try IDNA 2008 transitional

rfc1036 · May 23, 2017 · 1e6a7b3 · 1e6a7b3
1 parent d6e33ff
commit 1e6a7b3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/whois.c b/whois.c
@@ -1179,7 +1179,8 @@ char *normalize_domain(const char *dom)
 	if (NULL != strchr(domain_start, ':'))
             return ret;
 	if (idn2_lookup_ul(domain_start, &q, IDN2_NONTRANSITIONAL) != IDN2_OK)
-	    return ret;
+	    if (idn2_lookup_ul(domain_start, &q, IDN2_TRANSITIONAL) != IDN2_OK)
+	        return ret;
 #else
 	if (idna_to_ascii_lz(domain_start, &q, 0) != IDNA_SUCCESS)
 	    return ret;
@@ -1206,7 +1207,8 @@ char *normalize_domain(const char *dom)
 	if (NULL != strchr(ret, ':'))
             return ret;
 	if (idn2_lookup_ul(ret, &q, IDN2_NONTRANSITIONAL) != IDN2_OK)
-	    return ret;
+	    if (idn2_lookup_ul(ret, &q, IDN2_TRANSITIONAL) != IDN2_OK)
+	        return ret;
 #else
 	if (idna_to_ascii_lz(ret, &q, 0) != IDNA_SUCCESS)
 	    return ret;