lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-22 04:01:57 +03:00
Code Activity

Backport BIND code to query name as TLD.

Browse Source
This commit is contained in:
Ulrich Drepper
2011-05-07 13:05:19 -04:00
parent 47c3cd7a74
commit f87dfb1f11
6 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2011-05-07 Ulrich Drepper <drepper@gmail.com>
[BZ #12734]
* resolv/resolv.h: Define RES_NOTLDQUERY.
* resolv/res_init.c (res_setoptions): Recognize no_tld_query and
no-tld-query and set RES_NOTLDQUERY.
* resolv/res_debug.c (p_option): Handle RES_NOTLDQUERY.
* resolv/res_query.c (__libc_res_nsearch): Backport changes from
modern BIND to search name as TLD unless forbidden.
2011-05-07 Petr Baudis <pasky@suse.cz> 2011-05-07 Petr Baudis <pasky@suse.cz>
Ulrich Drepper <drepper@gmail.com> Ulrich Drepper <drepper@gmail.com>

2
NEWS
View File

@ -24,7 +24,7 @@ Version 2.14
11724, 12393, 12420, 12445, 12454, 12460, 12469, 12489, 12509, 12510, 11724, 12393, 12420, 12445, 12454, 12460, 12469, 12489, 12509, 12510,
12518, 12583, 12587, 12597, 12631, 12650, 12653, 12655, 12685, 12714, 12518, 12583, 12587, 12597, 12631, 12650, 12653, 12655, 12685, 12714,
12717, 12723 12717, 12723, 12734
Version 2.13 Version 2.13

1
resolv/res_debug.c
View File

@ -588,6 +588,7 @@ p_option(u_long option) {
case RES_USEBSTRING: return "ip6-bytstring"; case RES_USEBSTRING: return "ip6-bytstring";
case RES_USE_EDNS0: return "edns0"; case RES_USE_EDNS0: return "edns0";
case RES_USE_DNSSEC: return "dnssec"; case RES_USE_DNSSEC: return "dnssec";
case RES_NOTLDQUERY: return "no-tld-query";
/* XXX nonreentrant */ /* XXX nonreentrant */
default: sprintf(nbuf, "?0x%lx?", (u_long)option); default: sprintf(nbuf, "?0x%lx?", (u_long)option);
return (nbuf); return (nbuf);

5
resolv/res_init.c
View File

@ -545,6 +545,11 @@ res_setoptions(res_state statp, const char *options, const char *source) {
} else if (!strncmp(cp, "single-request", } else if (!strncmp(cp, "single-request",
sizeof("single-request") - 1)) { sizeof("single-request") - 1)) {
statp->options |= RES_SNGLKUP; statp->options |= RES_SNGLKUP;
} else if (!strncmp(cp, "no_tld_query",
sizeof("no_tld_query") - 1) ||
!strncmp(cp, "no-tld-query",
sizeof("no-tld-query") - 1)) {
statp->options |= RES_NOTLDQUERY;
} else { } else {
/* XXX - print a warning here? */ /* XXX - print a warning here? */
} }

10
resolv/res_query.c
View File

@ -344,6 +344,7 @@ __libc_res_nsearch(res_state statp,
int trailing_dot, ret, saved_herrno; int trailing_dot, ret, saved_herrno;
int got_nodata = 0, got_servfail = 0, root_on_list = 0; int got_nodata = 0, got_servfail = 0, root_on_list = 0;
int tried_as_is = 0; int tried_as_is = 0;
int searched = 0;
__set_errno (0); __set_errno (0);
RES_SET_H_ERRNO(statp, HOST_NOT_FOUND); /* True if we never query. */ RES_SET_H_ERRNO(statp, HOST_NOT_FOUND); /* True if we never query. */
@ -406,6 +407,7 @@ __libc_res_nsearch(res_state statp,
for (domain = (const char * const *)statp->dnsrch; for (domain = (const char * const *)statp->dnsrch;
*domain && !done; *domain && !done;
domain++) { domain++) {
searched = 1;
if (domain[0][0] == '\0' || if (domain[0][0] == '\0' ||
(domain[0][0] == '.' && domain[0][1] == '\0')) (domain[0][0] == '.' && domain[0][1] == '\0'))
@ -477,11 +479,11 @@ __libc_res_nsearch(res_state statp,
} }
/* /*
* If the name has any dots at all, and no earlier 'as-is' query * f the query has not already been tried as is then try it
* for the name, and "." is not on the search list, then try an as-is * unless RES_NOTLDQUERY is set and there were no dots.
* query now.
*/ */
if (dots && !(tried_as_is || root_on_list)) { if ((dots || !searched || (statp->options & RES_NOTLDQUERY) == 0)
&& !(tried_as_is || root_on_list)) {
ret = __libc_res_nquerydomain(statp, name, NULL, class, type, ret = __libc_res_nquerydomain(statp, name, NULL, class, type,
answer, anslen, answerp, answer, anslen, answerp,
answerp2, nanswerp2, resplen2); answerp2, nanswerp2, resplen2);

2
resolv/resolv.h
View File

@ -219,6 +219,8 @@ struct res_sym {
#define RES_SNGLKUPREOP 0x00400000 /* -"-, but open new socket for each #define RES_SNGLKUPREOP 0x00400000 /* -"-, but open new socket for each
request */ request */
#define RES_USE_DNSSEC 0x00800000 /* use DNSSEC using OK bit in OPT */ #define RES_USE_DNSSEC 0x00800000 /* use DNSSEC using OK bit in OPT */
#define RES_NOTLDQUERY 0x01000000 /* Do not look up unqualified name
as a TLD. */
#define RES_DEFAULT (RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT) #define RES_DEFAULT (RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT)