rpms/bind/devel bind-95-rh469440.patch, NONE, 1.1 bind.spec, 1.283, 1.284

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4416

Modified Files:
	bind.spec 
Added Files:
	bind-95-rh469440.patch 
Log Message:
- dig/host: use only IPv4 addresses when -4 option is specified (#469440)


bind-95-rh469440.patch:

--- NEW FILE bind-95-rh469440.patch ---
diff -up bind-9.5.1b2/bin/dig/dighost.c.rh469440 bind-9.5.1b2/bin/dig/dighost.c
--- bind-9.5.1b2/bin/dig/dighost.c.rh469440	2008-11-03 10:14:05.000000000 +0100
+++ bind-9.5.1b2/bin/dig/dighost.c	2008-11-03 10:33:13.000000000 +0100
@@ -596,6 +596,11 @@ copy_server_list(lwres_conf_t *confdata,
 	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);
@@ -1051,8 +1056,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)
@@ -1063,10 +1070,12 @@ setup_system(void) {
 			if (lwresult != ISC_R_SUCCESS)
 				fatal("add_nameserver failed");
 		}
-	}
 
-	if (ISC_LIST_EMPTY(server_list))
 		copy_server_list(lwconf, &server_list);
+		if (ISC_LIST_EMPTY(server_list)) {
+			fatal("Could not find any nameserver");
+		}
+	}
 
 #ifdef WITH_IDN
 	initialize_idn();


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- bind.spec	30 Oct 2008 13:50:06 -0000	1.283
+++ bind.spec	3 Nov 2008 11:36:03 -0000	1.284
@@ -19,7 +19,7 @@
 Name:     bind
 License:  ISC
 Version:  9.5.1
-Release:  0.8.2.%{PREVER}%{?dist}
+Release:  0.8.4.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +57,7 @@
 Patch72: bind-9.5-dlz-64bit.patch
 Patch87: bind-9.5-parallel-build.patch
 Patch95: bind-95-sdlz-include.patch
+Patch96: bind-95-rh469440.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -237,6 +238,7 @@
 %patch87 -p1 -b .parallel
 %patch94 -p1 -b .rh461409
 %patch95 -p1 -b .includes
+%patch96 -p1 -b .rh469440
 
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
@@ -634,6 +636,9 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Mon Nov 03 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.8.4.b2
+- dig/host: use only IPv4 addresses when -4 option is specified (#469440)
+
 * Thu Oct 30 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.8.2.b2
 - removed unneeded bind-9.4.1-ldap-api.patch