upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

2514. [bug] dig/host failed with -4 or -6 when resolv.conf contains

Browse source 
a nameserver of the unsupported address family.
			[RT #18848]
This commit is contained in:
Tatuya JINMEI 神明達哉 2008-12-13 02:43:25 +00:00
parent 24450ad58d
commit 96465858fa
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,8 @@
2513 [bug] Fix windows cli build. [RT #19062]
2514. [bug] dig/host failed with -4 or -6 when resolv.conf contains
a nameserver of the unsupported address family.
[RT #18848]
2513. [bug] Fix windows cli build. [RT #19062]
2512. [func] Print a summary of the cached records which make up
the negative response. [RT #18885]

14
bin/dig/dighost.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dighost.c,v 1.312 2008/12/10 22:33:54 marka Exp $ */
/* $Id: dighost.c,v 1.313 2008/12/13 02:43:25 jinmei Exp $ */
/*! \file
* \note
@ -583,6 +583,11 @@ copy_server_list(lwres_conf_t *confdata, dig_serverlist_t *dest) {
for (i = 0; i < confdata->nsnext; i++) {
af = addr2af(confdata->nameservers[i].family);
if (af == AF_INET && !have_ipv4)
continue;
if (af == AF_INET6 && !have_ipv6)
continue;
lwres_net_ntop(af, confdata->nameservers[i].address,
tmp, sizeof(tmp));
newsrv = make_server(tmp, tmp);
@ -1035,8 +1040,10 @@ setup_system(void) {
debug("ndots is %d.", ndots);
}
copy_server_list(lwconf, &server_list);
/* If we don't find a nameserver fall back to localhost */
if (lwconf->nsnext == 0) {
if (ISC_LIST_EMPTY(server_list)) {
if (have_ipv4) {
lwresult = add_nameserver(lwconf, "127.0.0.1", AF_INET);
if (lwresult != ISC_R_SUCCESS)
@ -1047,10 +1054,9 @@ setup_system(void) {
if (lwresult != ISC_R_SUCCESS)
fatal("add_nameserver failed");
}
}
if (ISC_LIST_EMPTY(server_list))
copy_server_list(lwconf, &server_list);
}
#ifdef WITH_IDN
initialize_idn();