X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=b711ef9840610fe7246bae15164966bdbbf86c3a;hb=af866c3b44ba37577671f2bffd482499f4b8bc00;hp=30e1269bc9a8eb705a96a39ef48db0d0e993d106;hpb=bf8e890ea7aaae4e00edd70453b1dc2cc78e3d6d;p=openldap

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 30e1269bc9..b711ef9840 100644
--- 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-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,18 @@
  */
 int		slap_debug = 0;
 
+#ifdef LDAP_DEBUG
+int		ldap_syslog = LDAP_DEBUG_STATS;
+#else
+int		ldap_syslog;
+#endif
+
+#ifdef LOG_DEBUG
+int		ldap_syslog_level = LOG_DEBUG;
+#endif
+
+BerVarray default_referral = NULL;
+
 struct berval AllUser = BER_BVC( LDAP_ALL_USER_ATTRIBUTES );
 struct berval AllOper = BER_BVC( LDAP_ALL_OPERATIONAL_ATTRIBUTES );
 struct berval NoAttrs = BER_BVC( LDAP_NO_ATTRS );
@@ -51,22 +63,21 @@ struct berval NoAttrs = BER_BVC( LDAP_NO_ATTRS );
 /*
  * global variables that need mutex protection
  */
-#ifdef LDAP_DEBUG
-int ldap_syslog = LDAP_DEBUG_STATS;
-#else
-int ldap_syslog;
+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
 
-#ifdef LOG_DEBUG
-int ldap_syslog_level = LOG_DEBUG;
-#else
-int ldap_syslog_level;
-#endif
+slap_counters_t			slap_counters;
 
 /*
  * these mutexes must be used when calling the entry2str()
  * routine since it returns a pointer to static data.
  */
+ldap_pvt_thread_mutex_t	entry2str_mutex;
+ldap_pvt_thread_mutex_t	replog_mutex;
+
 static const char* slap_name = NULL;
 int slapMode = SLAP_UNDEFINED_MODE;
 
@@ -99,35 +110,33 @@ slap_init( int mode, const char *name )
 
 		slap_name = name;
 
-		ldap_pvt_thread_pool_init( &SLAPD_GLOBAL(connection_pool),
-				SLAPD_GLOBAL(connection_pool_max), 0);
+		ldap_pvt_thread_pool_init( &connection_pool,
+				connection_pool_max, 0);
 
-		ldap_pvt_thread_mutex_init( &SLAPD_GLOBAL(entry2str_mutex) );
-		ldap_pvt_thread_mutex_init( &SLAPD_GLOBAL(replog_mutex) );
+		ldap_pvt_thread_mutex_init( &entry2str_mutex );
+		ldap_pvt_thread_mutex_init( &replog_mutex );
 
-		ldap_pvt_thread_mutex_init( &SLAPD_GLOBAL(counters).sc_sent_mutex );
-		ldap_pvt_thread_mutex_init( &SLAPD_GLOBAL(counters).sc_ops_mutex );
-		ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_bytes );
-		ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_pdu );
-		ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_entries );
-		ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_refs );
+		ldap_pvt_thread_mutex_init( &slap_counters.sc_sent_mutex );
+		ldap_pvt_thread_mutex_init( &slap_counters.sc_ops_mutex );
+		ldap_pvt_mp_init( slap_counters.sc_bytes );
+		ldap_pvt_mp_init( slap_counters.sc_pdu );
+		ldap_pvt_mp_init( slap_counters.sc_entries );
+		ldap_pvt_mp_init( slap_counters.sc_refs );
 
-		ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_ops_completed );
-		ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_ops_initiated );
+		ldap_pvt_mp_init( slap_counters.sc_ops_initiated );
+		ldap_pvt_mp_init( slap_counters.sc_ops_completed );
 
 #ifdef SLAPD_MONITOR
 		for ( i = 0; i < SLAP_OP_LAST; i++ ) {
-			ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_ops_initiated_[ i ] );
-			ldap_pvt_mp_init( SLAPD_GLOBAL(counters).sc_ops_completed_[ i ] );
+			ldap_pvt_mp_init( slap_counters.sc_ops_initiated_[ i ] );
+			ldap_pvt_mp_init( slap_counters.sc_ops_completed_[ i ] );
 		}
 #endif /* SLAPD_MONITOR */
 
 #ifndef HAVE_GMTIME_R
-		ldap_pvt_thread_mutex_init( &SLAPD_GLOBAL(gmtime_mutex) );
-#endif
-#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
-		ldap_pvt_thread_mutex_init( &SLAPD_GLOBAL(passwd_mutex) );
+		ldap_pvt_thread_mutex_init( &gmtime_mutex );
 #endif
+		slap_passwd_init();
 
 		rc = slap_sasl_init();
 
@@ -205,8 +214,8 @@ int slap_destroy(void)
 		"%s destroy: freeing system resources.\n",
 		slap_name, 0, 0 );
 
-	if ( SLAPD_GLOBAL(default_referral) ) {
-		ber_bvarray_free( SLAPD_GLOBAL(default_referral) );
+	if ( default_referral ) {
+		ber_bvarray_free( default_referral );
 	}
 
 	rc = backend_destroy();
@@ -219,19 +228,19 @@ int slap_destroy(void)
 	case SLAP_SERVER_MODE:
 	case SLAP_TOOL_MODE:
 
-		ldap_pvt_thread_mutex_destroy( &SLAPD_GLOBAL(counters).sc_sent_mutex );
-		ldap_pvt_thread_mutex_destroy( &SLAPD_GLOBAL(counters).sc_ops_mutex );
-		ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_bytes );
-		ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_pdu );
-		ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_entries );
-		ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_refs );
-		ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_ops_completed );
-		ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_ops_initiated );
+		ldap_pvt_thread_mutex_destroy( &slap_counters.sc_sent_mutex );
+		ldap_pvt_thread_mutex_destroy( &slap_counters.sc_ops_mutex );
+		ldap_pvt_mp_clear( slap_counters.sc_bytes );
+		ldap_pvt_mp_clear( slap_counters.sc_pdu );
+		ldap_pvt_mp_clear( slap_counters.sc_entries );
+		ldap_pvt_mp_clear( slap_counters.sc_refs );
+		ldap_pvt_mp_clear( slap_counters.sc_ops_initiated );
+		ldap_pvt_mp_clear( slap_counters.sc_ops_completed );
 
 #ifdef SLAPD_MONITOR
 		for ( i = 0; i < SLAP_OP_LAST; i++ ) {
-			ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_ops_initiated_[ i ] );
-			ldap_pvt_mp_clear( SLAPD_GLOBAL(counters).sc_ops_completed_[ i ] );
+			ldap_pvt_mp_clear( slap_counters.sc_ops_initiated_[ i ] );
+			ldap_pvt_mp_clear( slap_counters.sc_ops_completed_[ i ] );
 		}
 #endif /* SLAPD_MONITOR */
 		break;