From owner-svn-src-vendor@FreeBSD.ORG Tue Jul 28 22:58:40 2009 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E41BF106564A; Tue, 28 Jul 2009 22:58:40 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B7AB88FC0C; Tue, 28 Jul 2009 22:58:40 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6SMweon045915; Tue, 28 Jul 2009 22:58:40 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6SMweIx045911; Tue, 28 Jul 2009 22:58:40 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200907282258.n6SMweIx045911@svn.freebsd.org> From: Doug Barton Date: Tue, 28 Jul 2009 22:58:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195928 - in vendor/bind9/dist: . bin/named X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jul 2009 22:58:41 -0000 Author: dougb Date: Tue Jul 28 22:58:40 2009 New Revision: 195928 URL: http://svn.freebsd.org/changeset/base/195928 Log: Vendor import of BIND 9.6.1-P1 Modified: vendor/bind9/dist/CHANGES vendor/bind9/dist/bin/named/update.c vendor/bind9/dist/version Modified: vendor/bind9/dist/CHANGES ============================================================================== --- vendor/bind9/dist/CHANGES Tue Jul 28 22:17:34 2009 (r195927) +++ vendor/bind9/dist/CHANGES Tue Jul 28 22:58:40 2009 (r195928) @@ -1,3 +1,7 @@ + --- 9.6.1-P1 released --- + +2640. [security] A specially crafted update packet will cause named + to exit. [RT #20000] --- 9.6.1 released --- Modified: vendor/bind9/dist/bin/named/update.c ============================================================================== --- vendor/bind9/dist/bin/named/update.c Tue Jul 28 22:17:34 2009 (r195927) +++ vendor/bind9/dist/bin/named/update.c Tue Jul 28 22:58:40 2009 (r195928) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: update.c,v 1.151.12.5 2009/04/30 07:03:37 marka Exp $ */ +/* $Id: update.c,v 1.151.12.5.12.1 2009/07/28 14:18:08 marka Exp $ */ #include @@ -979,7 +979,11 @@ temp_check(isc_mem_t *mctx, dns_diff_t * if (type == dns_rdatatype_rrsig || type == dns_rdatatype_sig) covers = dns_rdata_covers(&t->rdata); - else + else if (type == dns_rdatatype_any) { + dns_db_detachnode(db, &node); + dns_diff_clear(&trash); + return (DNS_R_NXRRSET); + } else covers = 0; /* Modified: vendor/bind9/dist/version ============================================================================== --- vendor/bind9/dist/version Tue Jul 28 22:17:34 2009 (r195927) +++ vendor/bind9/dist/version Tue Jul 28 22:58:40 2009 (r195928) @@ -1,4 +1,4 @@ -# $Id: version,v 1.43.12.5 2009/06/04 04:02:41 marka Exp $ +# $Id: version,v 1.43.12.5.8.1 2009/07/28 14:18:08 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -6,5 +6,5 @@ MAJORVER=9 MINORVER=6 PATCHVER=1 -RELEASETYPE= -RELEASEVER= +RELEASETYPE=-P +RELEASEVER=1