servers/slapd/init.c - diff

Return to init.c CVS log

Up to [OpenLDAP] / servers / slapd

Diff for /servers/slapd/init.c between versions 1.18.2.2 and 1.18.2.3

version 1.18.2.2, 1999/09/10 20:25:30	version 1.18.2.3, 2000/06/13 17:57:28
Line 1	Line 1
/* init.c - initialize various things */	/* init.c - initialize various things */
/* $OpenLDAP: pkg/ldap/servers/slapd/init.c,v 1.24 1999/09/08 17:06:33 kdz Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/init.c,v 1.35 2000/06/13 00:42:14 kurt Exp $ */
/*	/*
* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.	* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/	*/

Line 27 int ldap_syslog = LDAP_DEBUG_STATS;	Line 27 int ldap_syslog = LDAP_DEBUG_STATS;
int ldap_syslog;	int ldap_syslog;
#endif	#endif

	#ifdef LOG_DEBUG
int ldap_syslog_level = LOG_DEBUG;	int ldap_syslog_level = LOG_DEBUG;
	#endif

struct berval **default_referral = NULL;	struct berval **default_referral = NULL;
int g_argc;	int g_argc;
char **g_argv;	char **g_argv;
Line 35 char **g_argv;	Line 38 char **g_argv;
/*	/*
* global variables that need mutex protection	* global variables that need mutex protection
*/	*/
int active_threads;	ldap_pvt_thread_pool_t connection_pool;
ldap_pvt_thread_mutex_t active_threads_mutex;
ldap_pvt_thread_cond_t active_threads_cond;

ldap_pvt_thread_mutex_t gmtime_mutex;	ldap_pvt_thread_mutex_t gmtime_mutex;
#ifdef SLAPD_CRYPT	#ifdef SLAPD_CRYPT
ldap_pvt_thread_mutex_t crypt_mutex;	ldap_pvt_thread_mutex_t crypt_mutex;
Line 61 ldap_pvt_thread_mutex_t num_sent_mutex;	Line 61 ldap_pvt_thread_mutex_t num_sent_mutex;
ldap_pvt_thread_mutex_t entry2str_mutex;	ldap_pvt_thread_mutex_t entry2str_mutex;
ldap_pvt_thread_mutex_t replog_mutex;	ldap_pvt_thread_mutex_t replog_mutex;

static char* slap_name;	static const char* slap_name = NULL;
int slapMode = SLAP_UNDEFINED_MODE;	int slapMode = SLAP_UNDEFINED_MODE;

static ldap_pvt_thread_mutex_t currenttime_mutex;	static ldap_pvt_thread_mutex_t currenttime_mutex;

int	int
slap_init( int mode, char *name )	slap_init( int mode, const char *name )
{	{
int rc;	int rc;

Line 86 slap_init( int mode, char *name )	Line 86 slap_init( int mode, char *name )
case SLAP_SERVER_MODE:	case SLAP_SERVER_MODE:
case SLAP_TOOL_MODE:	case SLAP_TOOL_MODE:
Debug( LDAP_DEBUG_TRACE,	Debug( LDAP_DEBUG_TRACE,
"%s init: initiated %s.\n",	"%s init: initiated %s.\n", name,
name, ( mode & SLAP_TOOL_MODE ) ? "tool" : "server", 0 );	(mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server",
	0 );

slap_name = name;	slap_name = name;

(void) ldap_pvt_thread_initialize();	(void) ldap_pvt_thread_initialize();

ldap_pvt_thread_mutex_init( &active_threads_mutex );	ldap_pvt_thread_pool_init(&connection_pool, 0, 0);
ldap_pvt_thread_cond_init( &active_threads_cond );

ldap_pvt_thread_mutex_init( &currenttime_mutex );	ldap_pvt_thread_mutex_init( &currenttime_mutex );
ldap_pvt_thread_mutex_init( &entry2str_mutex );	ldap_pvt_thread_mutex_init( &entry2str_mutex );

Removed from v.1.18.2.2
changed lines
	Added in v.1.18.2.3