This commit was manufactured by cvs2git to create tag 'v9_9_0a2'.

CHANGES

@@ -1,7 +1,3 @@
-3157.	[tuning]	Reduce the time spent in "rndc reconfig" by parsing
-			the config file before pausing the server. [RT #21373]
-
-3156.	[placeholder]
 
 	--- 9.9.0a2 released ---
 

bin/named/server.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.620 2011/09/23 18:08:01 each Exp $ */
+/* $Id: server.c,v 1.619 2011/09/06 22:29:32 smann Exp $ */
 
 /*! \file */
 
@@ -4341,12 +4341,15 @@ load_configuration(const char *filename, ns_server_t *server,
 	ns_cache_t *nsc;
 	struct cfg_context *nzctx;
 	int num_zones = 0;
-	isc_boolean_t exclusive = ISC_FALSE;
 
 	ISC_LIST_INIT(viewlist);
 	ISC_LIST_INIT(builtin_viewlist);
 	ISC_LIST_INIT(cachelist);
 
+	/* Ensure exclusive access to configuration data. */
+	result = isc_task_beginexclusive(server->task);
+	RUNTIME_CHECK(result == ISC_R_SUCCESS);
+
 	/* Create the ACL configuration context */
 	if (ns_g_aclconfctx != NULL)
 		cfg_aclconfctx_detach(&ns_g_aclconfctx);
@@ -4442,13 +4445,6 @@ load_configuration(const char *filename, ns_server_t *server,
 		CHECK(result);
 	}
 
-	/* Ensure exclusive access to configuration data. */
-	if (!exclusive) {
-		result = isc_task_beginexclusive(server->task);
-		RUNTIME_CHECK(result == ISC_R_SUCCESS);
-		exclusive = ISC_TRUE;
-	}
-
 	/*
 	 * Set process limits, which (usually) needs to be done as root.
 	 */
@@ -5216,8 +5212,7 @@ load_configuration(const char *filename, ns_server_t *server,
 		adjust_interfaces(server, ns_g_mctx);
 
 	/* Relinquish exclusive access to configuration data. */
-	if (exclusive)
-		isc_task_endexclusive(server->task);
+	isc_task_endexclusive(server->task);
 
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER,
 		      ISC_LOG_DEBUG(1), "load_configuration: %s",

doc/private/SRCID

@@ -1,6 +1,6 @@
-# $Id: SRCID,v 1.914 2011/09/23 18:16:07 tbox Exp $
+# $Id: SRCID,v 1.911 2011/09/08 00:16:46 tbox Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
 #
-SRCID="( $Date: 2011/09/23 18:16:07 $ )"
+SRCID="( $Date: 2011/09/08 00:16:46 $ )"

doc/private/branches

@@ -281,7 +281,6 @@ rt20363				new	fdupont	// 2010-07-07 16:14 +0000
 rt20369				new	fdupont	// 2009-10-06 08:41 +0000
 rt20369a			new	fdupont	// 2009-10-06 14:25 +0000
 rt20372				new	each	// 2009-10-06 22:08 +0000
-rt20381				new	each	// 2011-09-21 18:57 +0000
 rt20399				new	marka	// 2009-10-14 02:27 +0000
 rt20405				new	each	// 2009-10-14 05:15 +0000
 rt20406				new	each	// 2009-10-20 00:14 +0000
@@ -507,7 +506,6 @@ rt25271				new	ckb	// 2011-07-26 20:05 +0000
 rt25285				new	ckb	// 2011-08-04 19:09 +0000
 rt25333				new	each	// 2011-08-02 20:37 +0000
 rt25358				new	each	// 2011-08-09 02:41 +0000
-rt25419				new	each	// 2011-09-14 19:56 +0000
 rt25452				new	each	// 2011-09-06 17:14 +0000
 rt25541_v96			new	each	// 2011-08-19 00:13 +0000
 rt25541_v97			new	each	// 2011-08-18 23:51 +0000