rpms/bind/FC-5 bind-9.3.2-rrsig.patch,NONE,1.1

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/bind/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4049

Added Files:
	bind-9.3.2-rrsig.patch 
Log Message:
added patch

bind-9.3.2-rrsig.patch:
 bin/named/query.c  |    4 ++--
 lib/dns/resolver.c |   19 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

--- NEW FILE bind-9.3.2-rrsig.patch ---
--- bind-9.3.2/lib/dns/resolver.c.old	2006-09-06 12:12:25.000000000 +0200
+++ bind-9.3.2/lib/dns/resolver.c	2006-09-06 12:20:50.000000000 +0200
@@ -765,7 +765,8 @@
 		INSIST(result != ISC_R_SUCCESS ||
 		       dns_rdataset_isassociated(event->rdataset) ||
 		       fctx->type == dns_rdatatype_any ||
-		       fctx->type == dns_rdatatype_rrsig);
+		       fctx->type == dns_rdatatype_rrsig ||
+		       fctx->type == dns_rdatatype_sig);
 
 		isc_task_sendanddetach(&task, ISC_EVENT_PTR(&event));
 	}
@@ -3201,7 +3202,8 @@
 	if (hevent != NULL) {
 		if (!negative && !chaining &&
 		    (fctx->type == dns_rdatatype_any ||
-		     fctx->type == dns_rdatatype_rrsig)) {
+		     fctx->type == dns_rdatatype_rrsig || 
+		     fctx->type == dns_rdatatype_sig)) {
 			/*
 			 * Don't bind rdatasets; the caller
 			 * will iterate the node.
@@ -3321,7 +3323,8 @@
 	if (!ISC_LIST_EMPTY(fctx->validators)) {
 		INSIST(!negative);
 		INSIST(fctx->type == dns_rdatatype_any ||
-		       fctx->type == dns_rdatatype_rrsig);
+		       fctx->type == dns_rdatatype_rrsig || 
+		       fctx->type == dns_rdatatype_sig);
 		/*
 		 * Don't send a response yet - we have
 		 * more rdatasets that still need to
@@ -3473,14 +3476,15 @@
 				return (result);
 			anodep = &event->node;
 			/*
-			 * If this is an ANY or SIG query, we're not going
+			 * If this is an ANY, SIG or RRSIG query, we're not going
 			 * to return any rdatasets, unless we encountered
 			 * a CNAME or DNAME as "the answer".  In this case,
 			 * we're going to return DNS_R_CNAME or DNS_R_DNAME
 			 * and we must set up the rdatasets.
 			 */
 			if ((fctx->type != dns_rdatatype_any &&
-			    fctx->type != dns_rdatatype_rrsig) ||
+			    fctx->type != dns_rdatatype_rrsig &&
+			    fctx->type != dns_rdatatype_sig) ||
 			    (name->attributes & DNS_NAMEATTR_CHAINING) != 0) {
 				ardataset = event->rdataset;
 				asigrdataset = event->sigrdataset;
@@ -3539,7 +3543,7 @@
 		 */
 		if (secure_domain && rdataset->trust != dns_trust_glue) {
 			/*
-			 * SIGs are validated as part of validating the
+			 * RRSIGs are validated as part of validating the
 			 * type they cover.
 			 */
 			if (rdataset->type == dns_rdatatype_rrsig)
@@ -3609,7 +3613,8 @@
 
 			if (ANSWER(rdataset) && need_validation) {
 				if (fctx->type != dns_rdatatype_any &&
-				    fctx->type != dns_rdatatype_rrsig) {
+				    fctx->type != dns_rdatatype_rrsig &&
+				    fctx->type != dns_rdatatype_sig) {
 					/*
 					 * This is The Answer.  We will
 					 * validate it, but first we cache
--- bind-9.3.2/bin/named/query.c.old	2006-09-06 12:12:25.000000000 +0200
+++ bind-9.3.2/bin/named/query.c	2006-09-06 12:13:34.000000000 +0200
@@ -2407,7 +2407,7 @@
 		is_zone = ISC_FALSE;
 
 		qtype = event->qtype;
-		if (qtype == dns_rdatatype_rrsig)
+		if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig)
 			type = dns_rdatatype_any;
 		else
 			type = qtype;
@@ -2448,7 +2448,7 @@
 	/*
 	 * If it's a SIG query, we'll iterate the node.
 	 */
-	if (qtype == dns_rdatatype_rrsig)
+	if (qtype == dns_rdatatype_rrsig || qtype == dns_rdatatype_sig)
 		type = dns_rdatatype_any;
 	else
 		type = qtype;