diff options
Diffstat (limited to 'bind-99-libidn.patch')
| -rw-r--r-- | bind-99-libidn.patch | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/bind-99-libidn.patch b/bind-99-libidn.patch index d782e66..6e042be 100644 --- a/bind-99-libidn.patch +++ b/bind-99-libidn.patch @@ -1,8 +1,8 @@ diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in -index 5e9febc..b1861a5 100644 +index bd219c5..f71685b 100644 --- a/bin/dig/Makefile.in +++ b/bin/dig/Makefile.in -@@ -48,10 +48,10 @@ DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} \ +@@ -38,10 +38,10 @@ DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} \ ${ISCCFGDEPLIBS} ${LWRESDEPLIBS} LIBS = ${LWRESLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \ @@ -15,7 +15,7 @@ index 5e9febc..b1861a5 100644 SUBDIRS = -@@ -69,6 +69,8 @@ HTMLPAGES = dig.html host.html nslookup.html +@@ -59,6 +59,8 @@ HTMLPAGES = dig.html host.html nslookup.html MANOBJS = ${MANPAGES} ${HTMLPAGES} @@ -25,10 +25,10 @@ index 5e9febc..b1861a5 100644 dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS} diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook -index c54d677..1079421 100644 +index 7a7e8e4..b36047f 100644 --- a/bin/dig/dig.docbook +++ b/bin/dig/dig.docbook -@@ -1170,8 +1170,8 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr +@@ -1251,8 +1251,8 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr <command>dig</command> appropriately converts character encoding of domain name before sending a request to DNS server or displaying a reply from the server. @@ -40,10 +40,10 @@ index c54d677..1079421 100644 <command>dig</command> runs. </para> diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c -index 3ca7cb9..f11884e 100644 +index 1f8bcf2..f657c30 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c -@@ -44,6 +44,11 @@ +@@ -33,6 +33,11 @@ #include <idn/api.h> #endif @@ -55,7 +55,7 @@ index 3ca7cb9..f11884e 100644 #include <dns/byaddr.h> #ifdef DIG_SIGCHASE #include <dns/callbacks.h> -@@ -168,6 +173,14 @@ static void idn_check_result(idn_result_t r, const char *msg); +@@ -158,6 +163,14 @@ static void idn_check_result(idn_result_t r, const char *msg); int idnoptions = 0; #endif @@ -70,7 +70,7 @@ index 3ca7cb9..f11884e 100644 isc_socket_t *keep = NULL; isc_sockaddr_t keepaddr; -@@ -1404,8 +1417,15 @@ setup_system(void) { +@@ -1448,8 +1461,15 @@ setup_system(isc_boolean_t ipv4only, isc_boolean_t ipv6only) { #ifdef WITH_IDN initialize_idn(); @@ -87,7 +87,7 @@ index 3ca7cb9..f11884e 100644 if (keyfile[0] != 0) setup_file_key(); else if (keysecret[0] != 0) -@@ -2191,12 +2211,14 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -2231,8 +2251,11 @@ setup_lookup(dig_lookup_t *lookup) { idn_result_t mr; char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME]; #endif @@ -97,14 +97,10 @@ index 3ca7cb9..f11884e 100644 -#ifdef WITH_IDN +#if defined (WITH_IDN) || defined (WITH_LIBIDN) - result = dns_name_settotextfilter(output_filter); + result = dns_name_settotextfilter(lookup->idnout ? + output_filter : NULL); check_result(result, "dns_name_settotextfilter"); - #endif -- - REQUIRE(lookup != NULL); - INSIST(!free_now); - -@@ -2233,6 +2255,14 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -2274,6 +2297,14 @@ setup_lookup(dig_lookup_t *lookup) { mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname, utf8_textname, sizeof(utf8_textname)); idn_check_result(mr, "convert textname to UTF-8"); @@ -119,7 +115,7 @@ index 3ca7cb9..f11884e 100644 #endif /* -@@ -2245,15 +2275,11 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -2286,15 +2317,11 @@ setup_lookup(dig_lookup_t *lookup) { if (lookup->new_search) { #ifdef WITH_IDN if ((count_dots(utf8_textname) >= ndots) || !usesearch) { @@ -138,7 +134,7 @@ index 3ca7cb9..f11884e 100644 lookup->origin = NULL; /* Force abs lookup */ lookup->done_as_is = ISC_TRUE; lookup->need_search = usesearch; -@@ -2261,7 +2287,6 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -2302,7 +2329,6 @@ setup_lookup(dig_lookup_t *lookup) { lookup->origin = ISC_LIST_HEAD(search_list); lookup->need_search = ISC_FALSE; } @@ -146,7 +142,7 @@ index 3ca7cb9..f11884e 100644 } #ifdef WITH_IDN -@@ -2278,6 +2303,20 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -2319,6 +2345,20 @@ setup_lookup(dig_lookup_t *lookup) { IDN_IDNCONV | IDN_LENCHECK, utf8_textname, idn_textname, sizeof(idn_textname)); idn_check_result(mr, "convert UTF-8 textname to IDN encoding"); @@ -167,7 +163,7 @@ index 3ca7cb9..f11884e 100644 #else if (lookup->origin != NULL) { debug("trying origin %s", lookup->origin->origin); -@@ -2372,6 +2411,13 @@ setup_lookup(dig_lookup_t *lookup) { +@@ -2389,6 +2429,13 @@ setup_lookup(dig_lookup_t *lookup) { result = dns_name_fromtext(lookup->name, &b, dns_rootname, 0, &lookup->namebuf); @@ -179,9 +175,9 @@ index 3ca7cb9..f11884e 100644 + dns_rootname, 0, + &lookup->namebuf); #else - len = (unsigned int) strlen(lookup->textname); + len = (unsigned int) strlen(lookup->textname); isc_buffer_init(&b, lookup->textname, len); -@@ -4227,7 +4273,7 @@ destroy_libs(void) { +@@ -4377,7 +4424,7 @@ destroy_libs(void) { void * ptr; dig_message_t *chase_msg; #endif @@ -190,7 +186,7 @@ index 3ca7cb9..f11884e 100644 isc_result_t result; #endif -@@ -4268,6 +4314,10 @@ destroy_libs(void) { +@@ -4418,6 +4465,10 @@ destroy_libs(void) { result = dns_name_settotextfilter(NULL); check_result(result, "dns_name_settotextfilter"); #endif @@ -201,7 +197,7 @@ index 3ca7cb9..f11884e 100644 dns_name_destroy(); if (commctx != NULL) { -@@ -4453,6 +4503,97 @@ idn_check_result(idn_result_t r, const char *msg) { +@@ -4603,6 +4654,97 @@ idn_check_result(idn_result_t r, const char *msg) { } } #endif /* WITH_IDN */ |