Added a conformant sortedResults support which is unable to sort anything.

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index c20bb4bbd64ce8eb4bf65517d362568f2196352c..b711ef9840610fe7246bae15164966bdbbf86c3a 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-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -68,9 +68,6 @@ 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
 
 slap_counters_t                        slap_counters;
 
@@ -121,43 +118,25 @@ slap_init( int mode, const char *name )
 
                ldap_pvt_thread_mutex_init( &slap_counters.sc_sent_mutex );
                ldap_pvt_thread_mutex_init( &slap_counters.sc_ops_mutex );
-#ifdef HAVE_GMP
-               mpz_init( slap_counters.sc_bytes );
-               mpz_init( slap_counters.sc_pdu );
-               mpz_init( slap_counters.sc_entries );
-               mpz_init( slap_counters.sc_refs );
+               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 );
 
-               mpz_init( slap_counters.sc_ops_completed );
-               mpz_init( slap_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++ ) {
-                       mpz_init( slap_counters.sc_ops_initiated_[ i ] );
-                       mpz_init( slap_counters.sc_ops_completed_[ i ] );
-               }
-#endif /* SLAPD_MONITOR */
-#else /* ! HAVE_GMP */
-               slap_counters.sc_bytes = 0;
-               slap_counters.sc_pdu = 0;
-               slap_counters.sc_entries = 0;
-               slap_counters.sc_refs = 0;
-
-               slap_counters.sc_ops_completed = 0;
-               slap_counters.sc_ops_initiated = 0;
-#ifdef SLAPD_MONITOR
-               for ( i = 0; i < SLAP_OP_LAST; i++ ) {
-                       slap_counters.sc_ops_initiated_[ i ] = 0;
-                       slap_counters.sc_ops_completed_[ i ] = 0;
+                       ldap_pvt_mp_init( slap_counters.sc_ops_initiated_[ i ] );
+                       ldap_pvt_mp_init( slap_counters.sc_ops_completed_[ i ] );
                }
 #endif /* SLAPD_MONITOR */
-#endif /* ! HAVE_GMP */
 
 #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
+               slap_passwd_init();
 
                rc = slap_sasl_init();
 
@@ -251,21 +230,19 @@ int slap_destroy(void)
 
                ldap_pvt_thread_mutex_destroy( &slap_counters.sc_sent_mutex );
                ldap_pvt_thread_mutex_destroy( &slap_counters.sc_ops_mutex );
-#ifdef HAVE_GMP
-               mpz_clear( slap_counters.sc_bytes );
-               mpz_clear( slap_counters.sc_pdu );
-               mpz_clear( slap_counters.sc_entries );
-               mpz_clear( slap_counters.sc_refs );
-               mpz_clear( slap_counters.sc_ops_completed );
-               mpz_clear( slap_counters.sc_ops_initiated );
+               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++ ) {
-                       mpz_clear( slap_counters.sc_ops_initiated_[ i ] );
-                       mpz_clear( slap_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 */
-#endif /* HAVE_GMP */
                break;
 
        default: