make sure NULL pointers are not dereferenced

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index be2c9b46489b04d28ae9ebc4d44cecbdebdd5a1c..4476d6a40e8317b5267100ed95ed27254764877a 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,9 +34,6 @@
 
 #include "slap.h"
 #include "lber_pvt.h"
-#ifdef LDAP_SLAPI
-#include "slapi/slapi.h"
-#endif
 
 #include "ldap_rq.h"
 
@@ -137,7 +134,6 @@ slap_init( int mode, const char *name )
 
                ldap_pvt_thread_pool_init( &connection_pool,
                                connection_pool_max, 0);
-
                ldap_pvt_thread_mutex_init( &entry2str_mutex );
                ldap_pvt_thread_mutex_init( &replog_mutex );
 
@@ -240,50 +236,22 @@ slap_init( int mode, const char *name )
 
 int slap_startup( Backend *be )
 {
-       int rc;
-
        Debug( LDAP_DEBUG_TRACE,
                "%s startup: initiated.\n",
                slap_name, 0, 0 );
 
 
-       rc = backend_startup( be );
-
-#ifdef LDAP_SLAPI
-       if( rc == 0 ) {
-               Slapi_PBlock *pb = slapi_pblock_new();
-
-               if ( slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
-                       rc = -1;
-               }
-               slapi_pblock_destroy( pb );
-       }
-#endif /* LDAP_SLAPI */
-
-       return rc;
+       return backend_startup( be );
 }
 
 int slap_shutdown( Backend *be )
 {
-       int rc;
-#ifdef LDAP_SLAPI
-       Slapi_PBlock *pb;
-#endif
-
        Debug( LDAP_DEBUG_TRACE,
                "%s shutdown: initiated\n",
                slap_name, 0, 0 );
 
        /* let backends do whatever cleanup they need to do */
-       rc = backend_shutdown( be ); 
-
-#ifdef LDAP_SLAPI
-       pb = slapi_pblock_new();
-       (void) slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_CLOSE_FN, pb );
-       slapi_pblock_destroy( pb );
-#endif /* LDAP_SLAPI */
-
-       return rc;
+       return backend_shutdown( be ); 
 }
 
 int slap_destroy(void)