forgot to bump libdns API revision number for 9.4-ESV-R4-P2

CHANGES

@@ -1,3 +1,9 @@
+	--- 9.6-ESV-R4-P2 released ---
+
+3123.	[security]	Change #2912 exposed a latent flaw in
+			dns_rdataset_totext() that could cause named to
+			crash with an assertion failure. [RT #24777]
+
 	--- 9.6-ESV-R4-P1 released ---
 
 3121.   [security]      An authoritative name server sending a negative

bin/named/bind9.xsl.h

@@ -1,6 +1,6 @@
 /*
- * Generated by convertxsl.pl 1.14 2008/07/17 23:43:26 jinmei Exp  
- * From bind9.xsl 1.19.82.2 2009/01/29 23:47:43 tbox Exp 
+ * Generated by convertxsl.pl 1.14 2008-07-17 23:43:26 jinmei Exp  
+ * From bind9.xsl 1.19.82.2 2009-01-29 23:47:43 tbox Exp 
  */
 static char xslmsg[] =
 	"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -20,7 +20,7 @@ static char xslmsg[] =
 	" - PERFORMANCE OF THIS SOFTWARE.\n"
 	"-->\n"
 	"\n"
-	"<!-- \045Id: bind9.xsl,v 1.19.82.2 2009/01/29 23:47:43 tbox Exp \045 -->\n"
+	"<!-- \045Id: bind9.xsl,v 1.19.82.2 2009-01-29 23:47:43 tbox Exp \045 -->\n"
 	"\n"
 	"<xsl:stylesheet version=\"1.0\"\n"
 	" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n"

bin/tests/system/dlv/clean.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.5.250.2.6.1 2011/05/27 00:19:17 each Exp $
+# $Id: clean.sh,v 1.5.250.2.6.2 2011/06/02 23:46:20 tbox Exp $
 
 rm -f random.data
 rm -f ns*/named.run

bin/tests/system/dlv/ns1/named.conf

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.4.964.1 2011/05/27 00:19:17 each Exp $ */
+/* $Id: named.conf,v 1.4.964.2 2011/06/02 23:46:20 tbox Exp $ */
 
 controls { /* empty */ };
 

bin/tests/system/dlv/ns1/root.db.in

@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db.in,v 1.3.2.2 2011/05/27 00:19:17 each Exp $
+; $Id: root.db.in,v 1.3.2.3 2011/06/02 23:46:20 tbox Exp $
 
 $TTL	120
 @		SOA	ns.rootservers.utld hostmaster.ns.rootservers.utld (

bin/tests/system/dlv/ns1/sign.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.3.2.2 2011/05/27 00:19:17 each Exp $
+# $Id: sign.sh,v 1.3.2.3 2011/06/02 23:46:20 tbox Exp $
 
 (cd ../ns2 && sh -e ./sign.sh || exit 1)
 

bin/tests/system/dlv/ns2/druz.db.in

@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: druz.db.in,v 1.4.2.2 2011/05/27 00:19:18 each Exp $
+; $Id: druz.db.in,v 1.4.2.3 2011/06/02 23:46:20 tbox Exp $
 
 $TTL	120
 @		SOA	ns hostmaster.ns 1 3600 1200 604800 60

bin/tests/system/dlv/ns2/named.conf

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.4.964.1 2011/05/27 00:19:18 each Exp $ */
+/* $Id: named.conf,v 1.4.964.2 2011/06/02 23:46:21 tbox Exp $ */
 
 controls { /* empty */ };
 

bin/tests/system/dlv/ns2/sign.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.3.2.2 2011/05/27 00:19:18 each Exp $
+# $Id: sign.sh,v 1.3.2.3 2011/06/02 23:46:21 tbox Exp $
 
 (cd ../ns3 && sh -e ./sign.sh || exit 1)
 

bin/tests/system/dlv/ns3/named.conf

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.4.964.1 2011/05/27 00:19:18 each Exp $ */
+/* $Id: named.conf,v 1.4.964.2 2011/06/02 23:46:21 tbox Exp $ */
 
 controls { /* empty */ };
 

bin/tests/system/dlv/ns3/sign.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.4.332.2.6.1 2011/05/27 00:19:18 each Exp $
+# $Id: sign.sh,v 1.4.332.2.6.2 2011/06/02 23:46:21 tbox Exp $
 
 (cd ../ns6 && sh -e sign.sh)
 

bin/tests/system/dlv/ns5/named.conf

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.8.964.1 2011/05/27 00:19:18 each Exp $ */
+/* $Id: named.conf,v 1.8.964.2 2011/06/02 23:46:21 tbox Exp $ */
 
 /*
  * Choose a keyname that is unlikely to clash with any real key names.

bin/tests/system/dlv/ns6/named.conf

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2.4.2.6.1 2011/05/27 00:19:18 each Exp $ */
+/* $Id: named.conf,v 1.2.4.2.6.2 2011/06/02 23:46:21 tbox Exp $ */
 
 controls { /* empty */ };
 

bin/tests/system/dlv/ns6/sign.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.2.4.2.6.1 2011/05/27 00:19:18 each Exp $
+# $Id: sign.sh,v 1.2.4.2.6.2 2011/06/02 23:46:21 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

bin/tests/system/dlv/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.4.424.1 2011/05/27 00:19:17 each Exp $
+# $Id: setup.sh,v 1.4.424.2 2011/06/02 23:46:20 tbox Exp $
 
 ../../genrandom 400 random.data
 

bin/tests/system/dlv/tests.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.4.332.2.6.1 2011/05/27 00:19:17 each Exp $
+# $Id: tests.sh,v 1.4.332.2.6.2 2011/06/02 23:46:20 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

doc/private/SRCID

@@ -1,6 +1,6 @@
-# $Id: SRCID,v 1.1.4.286 2011/01/31 00:15:35 tbox Exp $
+# $Id: SRCID,v 1.1.4.286.4.5 2011/06/09 00:15:57 tbox Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
 #
-SRCID="( $Date: 2011/01/31 00:15:35 $ )"
+SRCID="( $Date: 2011/06/09 00:15:57 $ )"

lib/dns/api

@@ -1,3 +1,3 @@
 LIBINTERFACE = 59
-LIBREVISION = 4
+LIBREVISION = 5
 LIBAGE = 1

lib/dns/include/dns/masterdump.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.h,v 1.42.602.1 2011/05/27 00:19:19 each Exp $ */
+/* $Id: masterdump.h,v 1.42.602.2 2011/06/02 23:46:22 tbox Exp $ */
 
 #ifndef DNS_MASTERDUMP_H
 #define DNS_MASTERDUMP_H 1

lib/dns/include/dns/rdataset.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.h,v 1.65.50.4.6.1 2011/05/27 00:19:19 each Exp $ */
+/* $Id: rdataset.h,v 1.65.50.4.6.2 2011/06/02 23:46:22 tbox Exp $ */
 
 #ifndef DNS_RDATASET_H
 #define DNS_RDATASET_H 1

lib/dns/masterdump.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.94.50.3.18.1 2011/05/27 00:19:19 each Exp $ */
+/* $Id: masterdump.c,v 1.94.50.3.18.2 2011/06/02 23:46:21 tbox Exp $ */
 
 /*! \file */
 

lib/dns/message.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.245.50.7 2010/06/03 05:29:03 marka Exp $ */
+/* $Id: message.c,v 1.245.50.7.6.2 2011/06/08 23:46:25 tbox Exp $ */
 
 /*! \file */
 
@@ -2481,7 +2481,7 @@ dns_message_reply(dns_message_t *msg, isc_boolean_t want_question_section) {
 	    msg->opcode != dns_opcode_notify)
 		want_question_section = ISC_FALSE;
 	if (msg->opcode == dns_opcode_update)
-		first_section = DNS_SECTION_ADDITIONAL;
+		first_section = DNS_SECTION_PREREQUISITE;
 	else if (want_question_section) {
 		if (!msg->question_ok)
 			return (DNS_R_FORMERR);

lib/dns/ncache.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ncache.c,v 1.43.48.7.6.1 2011/05/27 00:19:19 each Exp $ */
+/* $Id: ncache.c,v 1.43.48.7.6.2 2011/06/02 23:46:21 tbox Exp $ */
 
 /*! \file */
 

lib/dns/rdataset.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.c,v 1.82.50.4.6.1 2011/05/27 00:19:19 each Exp $ */
+/* $Id: rdataset.c,v 1.82.50.4.6.2 2011/06/02 23:46:22 tbox Exp $ */
 
 /*! \file */
 

lib/dns/validator.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.164.12.23.4.1 2011/05/27 00:19:19 each Exp $ */
+/* $Id: validator.c,v 1.164.12.23.4.2 2011/06/02 23:46:22 tbox Exp $ */
 
 #include <config.h>
 

util/copyrights

@@ -10,9 +10,6 @@
 ./README					X	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
 ./README.idnkit					X	2005,2009
 ./README.pkcs11					X	2008
-./RELEASE-NOTES-BIND-9.6.3.html			X	2011
-./RELEASE-NOTES-BIND-9.6.3.pdf			X	2011
-./RELEASE-NOTES-BIND-9.6.3.txt			X	2011
 ./acconfig.h					C	1999,2000,2001,2002,2003,2004,2005,2007,2009
 ./aclocal.m4					X	1999,2000,2001
 ./bin/.cvsignore				X	1998,1999,2000,2001
@@ -103,7 +100,7 @@
 ./bin/named/.cvsignore				X	1999,2000,2001,2007,2008
 ./bin/named/Makefile.in				MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008
 ./bin/named/bind9.xsl				SGML	2006,2007,2008,2009
-./bin/named/bind9.xsl.h				X	2007,2008,2009
+./bin/named/bind9.xsl.h				X	2007,2008,2009,2011
 ./bin/named/builtin.c				C	2001,2002,2003,2004,2005,2007,2010
 ./bin/named/client.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
 ./bin/named/config.c				C	2001,2002,2003,2004,2005,2006,2007,2008,2009
@@ -558,30 +555,33 @@
 ./bin/tests/system/dialup/setup.sh		SH	2000,2001,2004,2007
 ./bin/tests/system/dialup/tests.sh		SH	2000,2001,2004,2007
 ./bin/tests/system/digcomp.pl			PERL	2000,2001,2004,2007
-./bin/tests/system/dlv/clean.sh			SH	2004,2007,2010
-./bin/tests/system/dlv/ns1/named.conf		CONF-C	2004,2007
-./bin/tests/system/dlv/ns1/root.db		ZONE	2004,2007
+./bin/tests/system/dlv/clean.sh			SH	2004,2007,2010,2011
+./bin/tests/system/dlv/ns1/named.conf		CONF-C	2004,2007,2011
+./bin/tests/system/dlv/ns1/root.db.in		ZONE	2011
 ./bin/tests/system/dlv/ns1/rootservers.utld.db	ZONE	2004,2007
+./bin/tests/system/dlv/ns1/sign.sh		SH	2011
+./bin/tests/system/dlv/ns2/druz.db.in		ZONE	2011
 ./bin/tests/system/dlv/ns2/hints		ZONE	2004,2007
-./bin/tests/system/dlv/ns2/named.conf		CONF-C	2004,2007
+./bin/tests/system/dlv/ns2/named.conf		CONF-C	2004,2007,2011
+./bin/tests/system/dlv/ns2/sign.sh		SH	2011
 ./bin/tests/system/dlv/ns2/utld.db		ZONE	2004,2007
 ./bin/tests/system/dlv/ns3/child.db.in		ZONE	2004,2007,2010
 ./bin/tests/system/dlv/ns3/dlv.db.in		ZONE	2004,2007
 ./bin/tests/system/dlv/ns3/hints		ZONE	2004,2007
-./bin/tests/system/dlv/ns3/named.conf		CONF-C	2004,2007
-./bin/tests/system/dlv/ns3/sign.sh		SH	2004,2007,2010
+./bin/tests/system/dlv/ns3/named.conf		CONF-C	2004,2007,2011
+./bin/tests/system/dlv/ns3/sign.sh		SH	2004,2007,2010,2011
 ./bin/tests/system/dlv/ns4/child.db		ZONE	2004,2007
 ./bin/tests/system/dlv/ns4/hints		ZONE	2004,2007
 ./bin/tests/system/dlv/ns4/named.conf		CONF-C	2004,2007
 ./bin/tests/system/dlv/ns5/hints		ZONE	2004,2007
-./bin/tests/system/dlv/ns5/named.conf		CONF-C	2004,2006,2007
+./bin/tests/system/dlv/ns5/named.conf		CONF-C	2004,2006,2007,2011
 ./bin/tests/system/dlv/ns5/rndc.conf		CONF-C	2004,2007
 ./bin/tests/system/dlv/ns6/child.db.in		ZONE	2010
 ./bin/tests/system/dlv/ns6/hints		ZONE	2010
-./bin/tests/system/dlv/ns6/named.conf		CONF-C	2010
-./bin/tests/system/dlv/ns6/sign.sh		SH	2010
-./bin/tests/system/dlv/setup.sh			SH	2004,2007
-./bin/tests/system/dlv/tests.sh			SH	2004,2007,2010
+./bin/tests/system/dlv/ns6/named.conf		CONF-C	2010,2011
+./bin/tests/system/dlv/ns6/sign.sh		SH	2010,2011
+./bin/tests/system/dlv/setup.sh			SH	2004,2007,2011
+./bin/tests/system/dlv/tests.sh			SH	2004,2007,2010,2011
 ./bin/tests/system/dlz/clean.sh			SH	2010
 ./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.=	TXT.BRIEF	2010
 ./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=	TXT.BRIEF	2010
@@ -1762,7 +1762,7 @@
 ./lib/dns/include/dns/log.h			C	1999,2000,2001,2003,2004,2005,2006,2007,2009
 ./lib/dns/include/dns/lookup.h			C	2000,2001,2004,2005,2006,2007,2009
 ./lib/dns/include/dns/master.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2008
-./lib/dns/include/dns/masterdump.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2008
+./lib/dns/include/dns/masterdump.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2011
 ./lib/dns/include/dns/message.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
 ./lib/dns/include/dns/name.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2010
 ./lib/dns/include/dns/ncache.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010
@@ -1777,7 +1777,7 @@
 ./lib/dns/include/dns/rdata.h			C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
 ./lib/dns/include/dns/rdataclass.h		C	1998,1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/rdatalist.h		C	1999,2000,2001,2004,2005,2006,2007,2008
-./lib/dns/include/dns/rdataset.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
+./lib/dns/include/dns/rdataset.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
 ./lib/dns/include/dns/rdatasetiter.h		C	1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/rdataslab.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2008
 ./lib/dns/include/dns/rdatatype.h		C	1998,1999,2000,2001,2004,2005,2006,2007,2008
@@ -1820,10 +1820,10 @@
 ./lib/dns/log.c					C	1999,2000,2001,2003,2004,2005,2006,2007
 ./lib/dns/lookup.c				C	2000,2001,2003,2004,2005,2007
 ./lib/dns/master.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
-./lib/dns/masterdump.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
-./lib/dns/message.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
+./lib/dns/masterdump.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011
+./lib/dns/message.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
 ./lib/dns/name.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2010
-./lib/dns/ncache.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2010
+./lib/dns/ncache.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2010,2011
 ./lib/dns/nsec.c				C	1999,2000,2001,2003,2004,2005,2007,2008,2009
 ./lib/dns/nsec3.c				C	2006,2008,2009
 ./lib/dns/openssl_link.c			C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
@@ -1954,7 +1954,7 @@
 ./lib/dns/rdata/rdatastructsuf.h		C	1999,2000,2001,2004,2007
 ./lib/dns/rdatalist.c				C	1999,2000,2001,2003,2004,2005,2007,2008,2010
 ./lib/dns/rdatalist_p.h				C	2000,2001,2004,2005,2007,2008
-./lib/dns/rdataset.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
+./lib/dns/rdataset.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
 ./lib/dns/rdatasetiter.c			C	1999,2000,2001,2004,2005,2007
 ./lib/dns/rdataslab.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
 ./lib/dns/request.c				C	2000,2001,2002,2004,2005,2006,2007,2008,2009
@@ -1977,14 +1977,14 @@
 ./lib/dns/tkey.c				C	1999,2000,2001,2003,2004,2005,2006,2007,2008,2010
 ./lib/dns/tsig.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2010
 ./lib/dns/ttl.c					C	1999,2000,2001,2004,2005,2007
-./lib/dns/validator.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
+./lib/dns/validator.c				C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
 ./lib/dns/version.c				C	1998,1999,2000,2001,2004,2005,2007
 ./lib/dns/view.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
 ./lib/dns/win32/DLLMain.c			C	2001,2004,2007
 ./lib/dns/win32/gen.dsp				X	2001
 ./lib/dns/win32/gen.dsw				X	2001
 ./lib/dns/win32/gen.mak				X	2001,2006
-./lib/dns/win32/libdns.def			X	2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
+./lib/dns/win32/libdns.def			X	2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
 ./lib/dns/win32/libdns.dsp			X	2001,2002,2003,2004,2005,2006,2007,2008
 ./lib/dns/win32/libdns.dsw			X	2001
 ./lib/dns/win32/libdns.mak			X	2001,2002,2003,2004,2005,2006,2007,2008

version

@@ -1,4 +1,4 @@
-# $Id: version,v 1.43.12.11.2.2.2.1 2011/05/27 00:19:16 each Exp $
+# $Id: version,v 1.43.12.11.2.2.2.2 2011/06/08 22:03:10 each Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -7,4 +7,4 @@ MAJORVER=9
 MINORVER=6
 PATCHVER=
 RELEASETYPE=-ESV
-RELEASEVER=-R4-P1
+RELEASEVER=-R4-P2