X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=a8a8e812ea6395eb670ac0fa24128dd1544d197a;hb=b94d5e17e22b58b990dac4d4af5319be915366a6;hp=0afd7b7b7b0f7b4a6d1d33263b8978d259624c4b;hpb=cbb611744820bc24d4f0474fda9449f0a0c6a34f;p=openldap

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 0afd7b7b7b..a8a8e812ea 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -1,8 +1,27 @@
 /* init.c - initialize various things */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #include "portable.h"
@@ -16,7 +35,7 @@
 #include "slap.h"
 #include "lber_pvt.h"
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 /*
@@ -46,7 +65,9 @@ struct berval NoAttrs = BER_BVC( LDAP_NO_ATTRS );
  */
 ldap_pvt_thread_pool_t	connection_pool;
 int			connection_pool_max = SLAP_MAX_WORKER_THREADS;
+#ifndef HAVE_GMTIME_R
 ldap_pvt_thread_mutex_t	gmtime_mutex;
+#endif
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
 ldap_pvt_thread_mutex_t	passwd_mutex;
 #endif
@@ -117,7 +138,8 @@ slap_init( int mode, const char *name )
 	
 			(void) ldap_pvt_thread_initialize();
 
-			ldap_pvt_thread_pool_init(&connection_pool, connection_pool_max, 0);
+			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 );
@@ -134,7 +156,9 @@ slap_init( int mode, const char *name )
 			}
 #endif
 
+#ifndef HAVE_GMTIME_R
 			ldap_pvt_thread_mutex_init( &gmtime_mutex );
+#endif
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
 			ldap_pvt_thread_mutex_init( &passwd_mutex );
 #endif
@@ -182,7 +206,7 @@ int slap_startup( Backend *be )
 	if( rc == 0 ) {
 		Slapi_PBlock *pb = slapi_pblock_new();
 
-		if ( doPluginFNs( NULL, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
+		if ( slapi_int_call_plugins( NULL, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
 			rc = -1;
 		}
 		slapi_pblock_destroy( pb );
@@ -208,15 +232,12 @@ int slap_shutdown( Backend *be )
 		slap_name, 0, 0 );
 #endif
 
-
-	slap_sasl_destroy();
-
 	/* let backends do whatever cleanup they need to do */
 	rc = backend_shutdown( be ); 
 
 #ifdef LDAP_SLAPI
-	pb = slapi_pblock_new( );
-	(void) doPluginFNs( NULL, SLAPI_PLUGIN_START_FN, pb );
+	pb = slapi_pblock_new();
+	(void) slapi_int_call_plugins( NULL, SLAPI_PLUGIN_CLOSE_FN, pb );
 	slapi_pblock_destroy( pb );
 #endif /* LDAP_SLAPI */
 
@@ -239,6 +260,8 @@ int slap_destroy(void)
 
 	rc = backend_destroy();
 
+	slap_sasl_destroy();
+
 	entry_destroy();
 
 	ldap_pvt_thread_destroy();