[src/trunk]: src/external/bsd/bind/dist/bin/named Apply fix by BIND 9.8.0-P1:...

[taca <taca%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/510262244d74
branches:  trunk
changeset: 764821:510262244d74
user:      taca <taca%NetBSD.org@localhost>
date:      Fri May 06 15:28:19 2011 +0000

description:
Apply fix by BIND 9.8.0-P1: https://www.isc.org/CVE-2011-1907.

diffstat:

 external/bsd/bind/dist/bin/named/query.c |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r cec60e6f92ab -r 510262244d74 external/bsd/bind/dist/bin/named/query.c
--- a/external/bsd/bind/dist/bin/named/query.c  Fri May 06 13:45:35 2011 +0000
+++ b/external/bsd/bind/dist/bin/named/query.c  Fri May 06 15:28:19 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: query.c,v 1.2 2011/02/16 03:46:46 christos Exp $       */
+/*     $NetBSD: query.c,v 1.3 2011/05/06 15:28:19 taca Exp $   */
 
 /*
  * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
@@ -4089,9 +4089,15 @@
                        if (dns_rdataset_isassociated(*rdatasetp))
                                dns_rdataset_disassociate(*rdatasetp);
                        dns_db_detachnode(*dbp, nodep);
-                       result = dns_db_find(*dbp, qnamef, version, qtype, 0,
-                                            client->now, nodep, found,
-                                            *rdatasetp, NULL);
+
+                       if (qtype == dns_rdatatype_rrsig ||
+                           qtype == dns_rdatatype_sig)
+                               result = DNS_R_NXRRSET;
+                       else 
+                               result = dns_db_find(*dbp, qnamef, version,
+                                                    qtype, 0, client->now,
+                                                    nodep, found, *rdatasetp,
+                                                    NULL);
                }
        }
        switch (result) {