summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <vonsch@gmail.com>2011-10-28 15:05:56 +0200
committerAdam Tkac <vonsch@gmail.com>2011-10-28 15:06:56 +0200
commit61b073aa6a5fcf448ffd3a18970c38e4eaef1284 (patch)
treed3eaf07056d79716354752e27d15542da2a4ee0c
parent2d24bcf9045fa966469fd6f0915c54ca87bf8648 (diff)
downloadbind-61b073aa6a5fcf448ffd3a18970c38e4eaef1284.tar.gz
bind-61b073aa6a5fcf448ffd3a18970c38e4eaef1284.tar.xz
bind-61b073aa6a5fcf448ffd3a18970c38e4eaef1284.zip
nslookup failed to resolve name in certain cases
Signed-off-by: Adam Tkac <vonsch@gmail.com>
-rw-r--r--bind.spec9
-rw-r--r--nslookup-norec.patch28
2 files changed, 36 insertions, 1 deletions
diff --git a/bind.spec b/bind.spec
index ea8e83f..c299238 100644
--- a/bind.spec
+++ b/bind.spec
@@ -22,7 +22,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: ISC
Version: 9.8.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,7 @@ Patch120:bind97-rh700097.patch
Patch121:bind97-rh714049.patch
Patch122:bind98-dlz_buildfix.patch
Patch123:bind98-rh735103.patch
+Patch124:nslookup-norec.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -291,6 +292,9 @@ mkdir m4
%patch121 -p1 -b .rh714049
%patch122 -p1 -b .dlz_buildfix
%patch123 -p1 -b .rh735103
+pushd bin/dig
+%patch124 -p0 -b .nslookup-norec
+popd
# Sparc and s390 arches need to use -fPIE
%ifarch sparcv9 sparc64 s390 s390x
@@ -761,6 +765,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Fri Oct 28 2011 Adam Tkac <atkac redhat com> 32:9.8.1-4
+- nslookup failed to resolve name in certain cases
+
* Mon Sep 26 2011 Adam Tkac <atkac redhat com> 32:9.8.1-3
- remove deps filter, it is no longer needed (#739663)
diff --git a/nslookup-norec.patch b/nslookup-norec.patch
new file mode 100644
index 0000000..50540c9
--- /dev/null
+++ b/nslookup-norec.patch
@@ -0,0 +1,28 @@
+--- dighost.c.orig 2011-03-11 07:46:58.000000000 +0100
++++ dighost.c 2011-10-28 14:31:29.806591603 +0200
+@@ -2619,8 +2619,13 @@ connect_timeout(isc_task_t *task, isc_ev
+ }
+ } else {
+ fputs(l->cmdline, stdout);
+- printf(";; connection timed out; no servers could be "
+- "reached\n");
++ if (!next_origin(NULL, query)) {
++ printf(";; connection timed out; no servers could be "
++ "reached\n");
++ } else {
++ printf(";; connection timed out; trying next "
++ "origin\n");
++ }
+ cancel_lookup(l);
+ check_next_lookup(l);
+ if (exitcode < 9)
+@@ -3270,7 +3275,8 @@ recv_done(isc_task_t *task, isc_event_t
+ return;
+ }
+ if ((msg->rcode == dns_rcode_servfail && !l->servfail_stops) ||
+- (check_ra && (msg->flags & DNS_MESSAGEFLAG_RA) == 0 && l->recurse))
++ (check_ra && (msg->flags & DNS_MESSAGEFLAG_RA) == 0 &&
++ msg->rcode != dns_rcode_noerror && l->recurse))
+ {
+ dig_query_t *next = ISC_LIST_NEXT(query, link);
+ if (l->current_query == query)