More system schema checks

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 0d29037e9090eb432594e5087393cd6d654485b2..18bcf152bacc4b7345fcbcba8c8c2898f3d99d93 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -1,7 +1,7 @@
 /* init.c - initialize various things */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -31,29 +31,26 @@ int         ldap_syslog;
 int            ldap_syslog_level = LOG_DEBUG;
 #endif
 
-struct berval **default_referral = NULL;
-int            g_argc;
-char           **g_argv;
+BVarray default_referral = NULL;
 
 /*
  * global variables that need mutex protection
  */
 ldap_pvt_thread_pool_t connection_pool;
+int                    connection_pool_max = SLAP_MAX_WORKER_THREADS;
 ldap_pvt_thread_mutex_t        gmtime_mutex;
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
 ldap_pvt_thread_mutex_t        passwd_mutex;
 #endif
-ldap_pvt_thread_mutex_t ad_mutex;
 
-int                            num_conns;
-long                   num_ops_initiated;
-long                   num_ops_completed;
+unsigned long                  num_ops_initiated;
+unsigned long                  num_ops_completed;
 ldap_pvt_thread_mutex_t        num_ops_mutex;
 
-long                   num_entries_sent;
-long                   num_refs_sent;
-long                   num_bytes_sent;
-long                   num_pdu_sent;
+unsigned long                  num_entries_sent;
+unsigned long                  num_refs_sent;
+unsigned long                  num_bytes_sent;
+unsigned long                  num_pdu_sent;
 ldap_pvt_thread_mutex_t        num_sent_mutex;
 /*
  * these mutexes must be used when calling the entry2str()
@@ -107,7 +104,7 @@ slap_init( int mode, const char *name )
        
                        (void) ldap_pvt_thread_initialize();
 
-                       ldap_pvt_thread_pool_init(&connection_pool, SLAP_MAX_WORKER_THREADS, 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 );
@@ -115,7 +112,6 @@ slap_init( int mode, const char *name )
                        ldap_pvt_thread_mutex_init( &num_sent_mutex );
 
                        ldap_pvt_thread_mutex_init( &gmtime_mutex );
-                       ldap_pvt_thread_mutex_init( &ad_mutex );
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
                        ldap_pvt_thread_mutex_init( &passwd_mutex );
 #endif