From 5691aedf5bb914deb1d18d42fd343e1c22872972 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Mon, 3 Nov 2008 11:36:03 +0000
Subject: [PATCH] - dig/host: use only IPv4 addresses when -4 option is
 specified (#469440)

---
 bind-95-rh469440.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
 bind.spec              |  7 ++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 bind-95-rh469440.patch

diff --git a/bind-95-rh469440.patch b/bind-95-rh469440.patch
new file mode 100644
index 0000000..08e0e5b
--- /dev/null
+++ b/bind-95-rh469440.patch
@@ -0,0 +1,42 @@
+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();
diff --git a/bind.spec b/bind.spec
index f9a655a..f4323b7 100644
--- a/bind.spec
+++ b/bind.spec
@@ -19,7 +19,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 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 @@ Patch71: bind-9.5-overflow.patch
 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 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %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 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_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