--- servers/slapd/init.c 1999/07/16 00:45:48 1.18 +++ servers/slapd/init.c 1999/08/19 19:32:35 1.18.2.1 @@ -1,4 +1,8 @@ /* init.c - initialize various things */ +/* + * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ #include "portable.h" @@ -66,6 +70,8 @@ slap_init( int mode, char *name ) { int rc; + assert( mode ); + if( slapMode != SLAP_UNDEFINED_MODE ) { Debug( LDAP_DEBUG_ANY, "%s init: init called twice (old=%d, new=%d)\n", @@ -75,18 +81,12 @@ slap_init( int mode, char *name ) slapMode = mode; - switch ( slapMode ) { - + switch ( slapMode & SLAP_MODE ) { case SLAP_SERVER_MODE: case SLAP_TOOL_MODE: -#ifdef SLAPD_BDB2 - case SLAP_TIMEDSERVER_MODE: - case SLAP_TOOLID_MODE: -#endif - Debug( LDAP_DEBUG_TRACE, "%s init: initiated %s.\n", - name, mode == SLAP_TOOL_MODE ? "tool" : "server", 0 ); + name, ( mode & SLAP_TOOL_MODE ) ? "tool" : "server", 0 ); slap_name = name; @@ -106,7 +106,7 @@ slap_init( int mode, char *name ) ldap_pvt_thread_mutex_init( &crypt_mutex ); #endif - rc = backend_init(); + rc = backend_init( ); break; default: @@ -119,7 +119,7 @@ slap_init( int mode, char *name ) return rc; } -int slap_startup(int dbnum) +int slap_startup( Backend *be ) { int rc; @@ -127,12 +127,16 @@ int slap_startup(int dbnum) "%s startup: initiated.\n", slap_name, 0, 0 ); - rc = backend_startup(dbnum); + rc = backend_startup( be ); + + if( rc == 0 ) { + rc = sasl_init(); + } return rc; } -int slap_shutdown(int dbnum) +int slap_shutdown( Backend *be ) { int rc; @@ -140,8 +144,10 @@ int slap_shutdown(int dbnum) "%s shutdown: initiated\n", slap_name, 0, 0 ); + sasl_destroy(); + /* let backends do whatever cleanup they need to do */ - rc = backend_shutdown(dbnum); + rc = backend_shutdown( be ); return rc; } @@ -156,6 +162,8 @@ int slap_destroy(void) rc = backend_destroy(); + entry_destroy(); + ldap_pvt_thread_destroy(); /* should destory the above mutex */