From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 16 Dec 2005 22:24:53 +0000 (+0000)
Subject: slapdn calls shutdown without startup
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~563
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ce3c024557816bf1f88a29ab93026269cb7bb384;p=openldap

slapdn calls shutdown without startup
---

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index 8d0e032f6d..6fc5afed39 100644
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -174,6 +174,8 @@ parse_slapacl( void )
  *	argc, argv	command line arguments
  */
 
+static int need_shutdown;
+
 void
 slap_tool_init(
 	const char* progname,
@@ -663,6 +665,8 @@ startup:;
 
 	/* slapdn doesn't specify a backend to startup */
 	if ( !dryrun && tool != SLAPDN && slap_startup( be ) ) {
+		need_shutdown = 1;
+
 		switch ( tool ) {
 		case SLAPTEST:
 			fprintf( stderr, "slap_startup failed "
@@ -682,7 +686,9 @@ startup:;
 void slap_tool_destroy( void )
 {
 	if ( !dryrun ) {
-		slap_shutdown( be );
+		if ( need_shutdown ) {
+			slap_shutdown( be );
+		}
 		slap_destroy();
 	}
 #ifdef SLAPD_MODULES