X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Finit.c;h=90f66152ea85758efc344eaf96c4d0394d7d3259;hb=e178624b422dff28a8ffea846376e8049c7e4e04;hp=2e25add973103433bed16616821137b00541a14e;hpb=d4d03e36e5990c8cb51eb759821c3f447af79c9f;p=openldap diff --git a/servers/slapd/init.c b/servers/slapd/init.c index 2e25add973..90f66152ea 100644 --- 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 */ @@ -14,6 +14,7 @@ #include #include "slap.h" +#include "lber_pvt.h" /* * read-only global variables or variables only written by the listener @@ -31,28 +32,34 @@ int ldap_syslog; int ldap_syslog_level = LOG_DEBUG; #endif -struct berval **default_referral = NULL; -int g_argc; -char **g_argv; +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 ); /* * 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; -#ifdef SLAPD_CRYPT -ldap_pvt_thread_mutex_t crypt_mutex; +#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD ) +ldap_pvt_thread_mutex_t passwd_mutex; #endif -int num_conns; -long num_ops_initiated; -long num_ops_completed; +unsigned long num_ops_initiated = 0; +unsigned long num_ops_completed = 0; +#ifdef SLAPD_MONITOR +unsigned long num_ops_initiated_[SLAP_OP_LAST]; +unsigned long num_ops_completed_[SLAP_OP_LAST]; +#endif /* SLAPD_MONITOR */ 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() @@ -64,7 +71,64 @@ ldap_pvt_thread_mutex_t replog_mutex; static const char* slap_name = NULL; int slapMode = SLAP_UNDEFINED_MODE; -static ldap_pvt_thread_mutex_t currenttime_mutex; +/* + * all known control OIDs should be added to this list + */ +char *slap_known_controls[] = { +#ifdef LDAP_CONTROL_REFERRALS + LDAP_CONTROL_REFERRALS, +#endif /* LDAP_CONTROL_REFERRALS */ + +#ifdef LDAP_CONTROL_MANAGEDSAIT + LDAP_CONTROL_MANAGEDSAIT, +#endif /* LDAP_CONTROL_MANAGEDSAIT */ + +#ifdef LDAP_CONTROL_SUBENTRIES + LDAP_CONTROL_SUBENTRIES, +#endif /* LDAP_CONTROL_SUBENTRIES */ + +#ifdef LDAP_CONTROL_NOOP + LDAP_CONTROL_NOOP, +#endif /* LDAP_CONTROL_NOOP */ + +#ifdef LDAP_CONTROL_DUPENT_REQUEST + LDAP_CONTROL_DUPENT_REQUEST, +#endif /* LDAP_CONTROL_DUPENT_REQUEST */ + +#ifdef LDAP_CONTROL_DUPENT_RESPONSE + LDAP_CONTROL_DUPENT_RESPONSE, +#endif /* LDAP_CONTROL_DUPENT_RESPONSE */ + +#ifdef LDAP_CONTROL_DUPENT_ENTRY + LDAP_CONTROL_DUPENT_ENTRY, +#endif /* LDAP_CONTROL_DUPENT_ENTRY */ + +#ifdef LDAP_CONTROL_PAGEDRESULTS + LDAP_CONTROL_PAGEDRESULTS, +#endif /* LDAP_CONTROL_PAGEDRESULTS */ + +#ifdef LDAP_CONTROL_SORTREQUEST + LDAP_CONTROL_SORTREQUEST, +#endif /* LDAP_CONTROL_SORTREQUEST */ + +#ifdef LDAP_CONTROL_SORTRESPONSE + LDAP_CONTROL_SORTRESPONSE, +#endif /* LDAP_CONTROL_SORTRESPONSE */ + +#ifdef LDAP_CONTROL_VLVREQUEST + LDAP_CONTROL_VLVREQUEST, +#endif /* LDAP_CONTROL_VLVREQUEST */ + +#ifdef LDAP_CONTROL_VLVRESPONSE + LDAP_CONTROL_VLVRESPONSE, +#endif /* LDAP_CONTROL_VLVRESPONSE */ + +#ifdef LDAP_CONTROL_VALUESRETURNFILTER + LDAP_CONTROL_VALUESRETURNFILTER, +#endif /* LDAP_CONTROL_VALUESRETURNFILTER */ + + NULL +}; int slap_init( int mode, const char *name ) @@ -74,9 +138,16 @@ slap_init( int mode, const char *name ) assert( mode ); if( slapMode != SLAP_UNDEFINED_MODE ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, CRIT, + "init: %s init called twice (old=%d, new=%d)\n", + name, slapMode, mode ); +#else Debug( LDAP_DEBUG_ANY, - "%s init: init called twice (old=%d, new=%d)\n", - name, slapMode, mode ); + "%s init: init called twice (old=%d, new=%d)\n", + name, slapMode, mode ); +#endif + return 1; } @@ -85,34 +156,61 @@ slap_init( int mode, const char *name ) switch ( slapMode & SLAP_MODE ) { case SLAP_SERVER_MODE: case SLAP_TOOL_MODE: +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, DETAIL1, + "init: %s initiation, initiated %s.\n", + name, (mode & SLAP_MODE) == SLAP_TOOL_MODE ? + "tool" : "server", 0 ); +#else Debug( LDAP_DEBUG_TRACE, "%s init: initiated %s.\n", name, (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server", 0 ); +#endif + slap_name = 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( ¤ttime_mutex ); ldap_pvt_thread_mutex_init( &entry2str_mutex ); ldap_pvt_thread_mutex_init( &replog_mutex ); ldap_pvt_thread_mutex_init( &num_ops_mutex ); ldap_pvt_thread_mutex_init( &num_sent_mutex ); +#ifdef SLAPD_MONITOR + { + int i; + for ( i = 0; i < SLAP_OP_LAST; i++ ) { + num_ops_initiated_[ i ] = 0; + num_ops_completed_[ i ] = 0; + } + } +#endif + ldap_pvt_thread_mutex_init( &gmtime_mutex ); -#ifdef SLAPD_CRYPT - ldap_pvt_thread_mutex_init( &crypt_mutex ); +#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD ) + ldap_pvt_thread_mutex_init( &passwd_mutex ); #endif - rc = backend_init( ); + rc = slap_sasl_init(); + + if( rc == 0 ) { + rc = backend_init( ); + } break; default: +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ERR, + "init: %s init, undefined mode (%d).\n", name, mode, 0 ); +#else Debug( LDAP_DEBUG_ANY, - "%s init: undefined mode (%d).\n", name, mode, 0 ); + "%s init: undefined mode (%d).\n", name, mode, 0 ); +#endif + rc = 1; break; } @@ -124,15 +222,16 @@ int slap_startup( Backend *be ) { int rc; +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, CRIT, "slap_startup: %s started\n", slap_name, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "%s startup: initiated.\n", slap_name, 0, 0 ); +#endif - rc = backend_startup( be ); - if( rc == 0 ) { - rc = sasl_init(); - } + rc = backend_startup( be ); return rc; } @@ -141,11 +240,17 @@ int slap_shutdown( Backend *be ) { int rc; +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, CRIT, + "slap_shutdown: %s shutdown initiated.\n", slap_name, 0, 0); +#else Debug( LDAP_DEBUG_TRACE, "%s shutdown: initiated\n", slap_name, 0, 0 ); +#endif - sasl_destroy(); + + slap_sasl_destroy(); /* let backends do whatever cleanup they need to do */ rc = backend_shutdown( be ); @@ -157,9 +262,15 @@ int slap_destroy(void) { int rc; +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, INFO, + "slap_destroy: %s freeing system resources.\n", slap_name, 0, 0); +#else Debug( LDAP_DEBUG_TRACE, "%s shutdown: freeing system resources.\n", slap_name, 0, 0 ); +#endif + rc = backend_destroy(); @@ -170,13 +281,3 @@ int slap_destroy(void) /* should destory the above mutex */ return rc; } - -/* should create a utils.c for these */ -time_t slap_get_time(void) -{ - time_t t; - ldap_pvt_thread_mutex_lock( ¤ttime_mutex ); - time( &t ); - ldap_pvt_thread_mutex_unlock( ¤ttime_mutex ); - return t; -}