Module Name: src
Committed By: taca
Date: Fri May 6 15:28:20 UTC 2011
Modified Files:
src/external/bsd/bind/dist/bin/named: query.c
Log Message:
Apply fix by BIND 9.8.0-P1: https://www.isc.org/CVE-2011-1907.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/bin/named/query.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/bin/named/query.c
diff -u src/external/bsd/bind/dist/bin/named/query.c:1.2 src/external/bsd/bind/dist/bin/named/query.c:1.3
--- src/external/bsd/bind/dist/bin/named/query.c:1.2 Wed Feb 16 03:46:46 2011
+++ src/external/bsd/bind/dist/bin/named/query.c Fri May 6 15:28:19 2011
@@ -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) {
