Centralize slap init/startup/shutdown/destroy into slapcommon

diff --git a/servers/slapd/tools/slapadd.c b/servers/slapd/tools/slapadd.c
index d815e444cb49209f742ca4967ec60d0254f9e7f6..abc894b71c93b3c408673433848439b593ab265d 100644 (file)
--- a/servers/slapd/tools/slapadd.c
+++ b/servers/slapd/tools/slapadd.c
@@ -24,7 +24,6 @@ main( int argc, char **argv )
        int                     rc = EXIT_SUCCESS;
 
        slap_tool_init( "slapadd", SLAPADD, argc, argv );
-       slap_startup( be );
 
        if( !be->be_entry_open &&
                !be->be_entry_close &&
@@ -112,8 +111,6 @@ main( int argc, char **argv )
                be->be_sync( be );
        }
 
-       slap_shutdown( be );
-       slap_destroy();
-
+       slap_tool_destroy();
        return rc;
 }

diff --git a/servers/slapd/tools/slapcat.c b/servers/slapd/tools/slapcat.c
index 32fa0214ad946942c3628d4bd4d134c900afe032..80e698cba317089dbaa8bfd293b062c68148e6f3 100644 (file)
--- a/servers/slapd/tools/slapcat.c
+++ b/servers/slapd/tools/slapcat.c
@@ -21,8 +21,6 @@ main( int argc, char **argv )
 
        slap_tool_init( "slapcat", SLAPCAT, argc, argv );
 
-       slap_startup( be );
-
        if( !be->be_entry_open &&
                !be->be_entry_close &&
                !be->be_entry_first &&
@@ -75,8 +73,6 @@ main( int argc, char **argv )
 
        be->be_entry_close( be );
 
-       slap_shutdown( be );
-       slap_destroy();
-
+       slap_tool_destroy();
        return rc;
 }

diff --git a/servers/slapd/tools/slapcommon.c b/servers/slapd/tools/slapcommon.c
index b9a98f55e8323186eb80d89f95deae980a2e35ef..3f5e0eef9fa00d96f4130947a40b31bac1fa0c67 100644 (file)
--- a/servers/slapd/tools/slapcommon.c
+++ b/servers/slapd/tools/slapcommon.c
@@ -211,4 +211,12 @@ slap_tool_init(
        } else {
                be = &backends[dbnum];
        }
+
+       slap_startup( be );
+}
+
+void slap_tool_destroy( void )
+{
+       slap_shutdown( be );
+       slap_destroy();
 }

diff --git a/servers/slapd/tools/slapcommon.h b/servers/slapd/tools/slapcommon.h
index c610539c91e76df14bb09cee508525659034f0ab..ffa400786121ea67f92698b0b93933a4309678db 100644 (file)
--- a/servers/slapd/tools/slapcommon.h
+++ b/servers/slapd/tools/slapcommon.h
@@ -35,4 +35,6 @@ void slap_tool_init LDAP_P((
        int tool,
        int argc, char **argv ));
 
+void slap_tool_destroy LDAP_P((void));
+
 #endif /* SLAPCOMMON_H_ */

diff --git a/servers/slapd/tools/slapindex.c b/servers/slapd/tools/slapindex.c
index 31ae1e3b1e70cda5e3294e74f2f3aec9371c8283..77abcd9798a763700db69e061ceb031041d0a2cf 100644 (file)
--- a/servers/slapd/tools/slapindex.c
+++ b/servers/slapd/tools/slapindex.c
@@ -24,8 +24,6 @@ main( int argc, char **argv )
 
        slap_tool_init( "slapindex", SLAPINDEX, argc, argv );
 
-       slap_startup( be );
-
        if( !be->be_entry_open &&
                !be->be_entry_close &&
                !be->be_entry_first &&
@@ -111,8 +109,7 @@ main( int argc, char **argv )
 
        (void) be->be_entry_close( be );
 
-       slap_shutdown( be );
-       slap_destroy();
+       slap_tool_destroy();
 
        return( rc );
 }