From 1585c7791fb6e017e844cf5518ff8fe8eacb3c53 Mon Sep 17 00:00:00 2001
From: Ruben Kerkhof <ruben@fedoraproject.org>
Date: Sep 12 2008 13:32:32 +0000
Subject: - Fix handling of AAAA records (bz #461768)


---

diff --git a/pdns-bz461768.patch b/pdns-bz461768.patch
new file mode 100644
index 0000000..84fc783
--- /dev/null
+++ b/pdns-bz461768.patch
@@ -0,0 +1,33 @@
+Index: /trunk/pdns/pdns/packethandler.cc
+===================================================================
+--- /trunk/pdns/pdns/packethandler.cc (revision 1079)
++++ /trunk/pdns/pdns/packethandler.cc (revision 1081)
+@@ -399,6 +399,8 @@
+       }
+     }
+-    if(hits && !found && !rfound && shortcut ) // we found matching qnames but not a qtype
++    if(hits && !found && !rfound && shortcut ) { // we found matching qnames but not a qtype
++      DLOG(L<<"Found matching qname, but not the qtype"<<endl);
+       return 2;
++    }
+ 
+     if(rfound)
+@@ -654,4 +656,5 @@
+ 
+     if(mret==2) { // there is some data, but not of the correct type
++      r->clearRecords();
+       DLOG(L<<"There is some data, but not of the correct type, adding SOA for NXRECORDSET"<<endl);
+       SOAData sd;
+@@ -696,5 +699,4 @@
+       }
+     }
+-
+     noSameLevelNS=true;
+ 
+@@ -739,5 +741,5 @@
+     // not found yet, try wildcards (we only try here in case of recursion - we should check before we hand off)
+ 
+-    if(p->d.rd && d_doRecursion && d_doWildcards) { 
++    if(mret != 2 && p->d.rd && d_doRecursion && d_doWildcards) { 
+       int res=doWildcardRecords(p,r,target);
+       if(res) { // had a result
diff --git a/pdns.spec b/pdns.spec
index 720971a..2cd6ded 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -1,7 +1,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
 Version:	2.9.21.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -11,6 +11,7 @@ Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
 Patch0:		%{name}-fixinit.patch
 Patch1:		%{name}-avoid-version.patch
 Patch2:		%{name}-gcc43.patch
+Patch3:         %{name}-bz461768.patch
 
 Requires(post):	%{_sbindir}/useradd, /sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig
@@ -84,6 +85,7 @@ This package contains the SQLite backend for %{name}
 %patch0 -p1 -b .fixinit
 %patch1 -p1 -b .avoid-version
 %patch2 -p1
+%patch3 -p3
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -183,6 +185,9 @@ fi
 
 
 %changelog
+* Fri Sep 12 2008 Ruben Kerkhof <ruben@rubenkerkhof.com> 2.9.21.1-2
+- Fix handling of AAAA records (bz #461768)
+
 * Wed Aug 06 2008 Ruben Kerkhof <ruben@rubenkerkhof.com> 2.9.21.1-1
 - CVE-2008-3337