+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
#include "portable.h"
#include <stdio.h>
#include <ac/time.h>
#include <ac/unistd.h>
#include <ac/wait.h>
-#include <ac/signal.h>
#include <ac/errno.h>
-#include "ldap_defaults.h"
+#include "ldap_pvt.h"
+
#include "slap.h"
#include "lutil.h"
+#include "ldif.h"
#ifdef LDAP_SIGCHLD
static RETSIGTYPE wait4child( int sig );
#endif
-#ifdef HAVE_WINSOCK
+#ifdef HAVE_NT_SERVICE_MANAGER
#define MAIN_RETURN(x) return
-struct sockaddr_in bind_addr;
-
-/* in nt_main.c */
-extern SERVICE_STATUS SLAPDServiceStatus;
-extern SERVICE_STATUS_HANDLE hSLAPDServiceStatus;
-extern ldap_pvt_thread_cond_t started_event, stopped_event;
-extern int is_NT_Service;
+static struct sockaddr_in bind_addr;
-void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, short port, int udp );
-void LogSlapdStoppedEvent( char *svc );
-
-void CommenceStartupProcessing( LPCTSTR serviceName,
+void CommenceStartupProcessing( LPCTSTR serverName,
void(*stopper)(int));
void ReportSlapdShutdownComplete( void );
void *getRegParam( char *svc, char *value );
-#define SERVICE_EXIT( e, n ) \
- if ( is_NT_Service ) \
-{ \
- SLAPDServiceStatus.dwWin32ExitCode = e; \
- SLAPDServiceStatus.dwServiceSpecificExitCode = n; \
-}
+#define SERVICE_EXIT( e, n ) do { \
+ if ( is_NT_Service ) { \
+ SLAPDServiceStatus.dwWin32ExitCode = (e); \
+ SLAPDServiceStatus.dwServiceSpecificExitCode = (n); \
+ } \
+} while ( 0 )
+
#else
#define SERVICE_EXIT( e, n )
#define MAIN_RETURN(x) return(x)
#endif
-short port = LDAP_PORT;
-#ifdef HAVE_TLS
-short tls_port = LDAP_TLS_PORT;
+#ifdef HAVE_NT_EVENT_LOG
+void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, char *urls );
+void LogSlapdStoppedEvent( char *svc );
#endif
+
/*
* when more than one slapd is running on one machine, each one might have
* it's own LOCAL for syslogging and must have its own pid/args files
#define DEFAULT_SYSLOG_USER LOG_LOCAL4
typedef struct _str2intDispatch {
- char *stringVal;
- int abbr;
- int intVal;
+ char *stringVal;
+ int abbr;
+ int intVal;
} STRDISP, *STRDISP_P;
/* table to compute syslog-options to integer */
-static STRDISP syslog_types[] = {
- { "LOCAL0", 6, LOG_LOCAL0 },
- { "LOCAL1", 6, LOG_LOCAL1 },
- { "LOCAL2", 6, LOG_LOCAL2 },
- { "LOCAL3", 6, LOG_LOCAL3 },
- { "LOCAL4", 6, LOG_LOCAL4 },
- { "LOCAL5", 6, LOG_LOCAL5 },
- { "LOCAL6", 6, LOG_LOCAL6 },
- { "LOCAL7", 6, LOG_LOCAL7 },
- { NULL }
+static STRDISP syslog_types[] = {
+ { "LOCAL0", sizeof("LOCAL0"), LOG_LOCAL0 },
+ { "LOCAL1", sizeof("LOCAL1"), LOG_LOCAL1 },
+ { "LOCAL2", sizeof("LOCAL2"), LOG_LOCAL2 },
+ { "LOCAL3", sizeof("LOCAL3"), LOG_LOCAL3 },
+ { "LOCAL4", sizeof("LOCAL4"), LOG_LOCAL4 },
+ { "LOCAL5", sizeof("LOCAL5"), LOG_LOCAL5 },
+ { "LOCAL6", sizeof("LOCAL6"), LOG_LOCAL6 },
+ { "LOCAL7", sizeof("LOCAL7"), LOG_LOCAL7 },
+ { NULL }
};
static int cnvt_str2int( char *, STRDISP_P, int );
-#endif /* LOG_LOCAL4 */
+#endif /* LOG_LOCAL4 */
static void
usage( char *name )
{
- fprintf( stderr, "usage: %s [-d ?|debuglevel] [-f configfile] [-p portnumber] [-s sysloglevel]", name );
- fprintf( stderr, "\n [-a bind-address] [-i] [-u]" );
-#ifdef HAVE_WINSOCK
- fprintf( stderr, " [-n NTserviceName]" );
-#endif
-#if LDAP_CONNECTIONLESS
- fprintf( stderr, " [-c]" );
-#endif
-#ifdef SLAPD_BDB2
- fprintf( stderr, " [-t]" );
+ fprintf( stderr,
+ "usage: %s options\n", name );
+ fprintf( stderr,
+ "\t-d level\tDebug Level" "\n"
+ "\t-f filename\tConfiguration File\n"
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+ "\t-g group\tGroup (id or name) to ran as\n"
#endif
+ "\t-h URLs\tList of URLs to serve\n"
#ifdef LOG_LOCAL4
- fprintf( stderr, " [-l sysloguser]" );
+ "\t-l sysloguser\tSyslog User (default: LOCAL4)\n"
+#endif
+ "\t-n serverName\tservice name\n"
+#ifdef HAVE_CHROOT
+ "\t-r directory\n"
#endif
+ "\t-s level\tSyslog Level\n"
#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
- fprintf( stderr, " [-u user] [-g group]" );
+ "\t-u user\tUser (id or name) to ran as\n"
#endif
- fprintf( stderr, "\n" );
+ );
}
-time_t starttime;
-struct sockaddr_in bind_addr;
-ber_int_t tcps;
-#ifdef HAVE_TLS
-struct sockaddr_in tls_bind_addr;
-ber_int_t tls_tcps;
-#endif
-
-#ifdef HAVE_WINSOCK
+#ifdef HAVE_NT_SERVICE_MANAGER
void WINAPI ServiceMain( DWORD argc, LPTSTR *argv )
#else
int main( int argc, char **argv )
#endif
{
- int i;
- int inetd = 0;
- int rc;
- struct slapd_args args;
- int udp;
+ int i, no_detach = 0;
+ int rc = 1;
+ char *urls = NULL;
#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
char *username = NULL;
char *groupname = NULL;
#endif
+#if defined(HAVE_CHROOT)
+ char *sandbox = NULL;
+#endif
#ifdef LOG_LOCAL4
- int syslogUser = DEFAULT_SYSLOG_USER;
+ int syslogUser = DEFAULT_SYSLOG_USER;
#endif
-#ifdef HAVE_WINSOCK
- char *NTservice = SERVICE_NAME;
+
+ int g_argc = argc;
+ char **g_argv = argv;
+
+#ifdef HAVE_NT_SERVICE_MANAGER
char *configfile = ".\\slapd.conf";
#else
char *configfile = SLAPD_DEFAULT_CONFIGFILE;
#endif
- char *serverName;
- int serverMode = SLAP_SERVER_MODE;
+ char *serverName = NULL;
+ int serverMode = SLAP_SERVER_MODE;
- (void) memset( (void*) &bind_addr, '\0', sizeof(bind_addr));
- bind_addr.sin_family = AF_INET;
- bind_addr.sin_addr.s_addr = htonl(INADDR_ANY);
- bind_addr.sin_port = htons(port);
-#ifdef HAVE_TLS
- tls_bind_addr.sin_family = AF_INET;
- tls_bind_addr.sin_addr.s_addr = htonl(INADDR_ANY);
- tls_bind_addr.sin_port = htons(tls_port);
+#ifdef CSRIMALLOC
+ FILE *leakfile;
+ if( ( leakfile = fopen( "slapd.leak", "w" )) == NULL ) {
+ leakfile = stderr;
+ }
#endif
- g_argc = argc;
- g_argv = argv;
-#ifdef HAVE_WINSOCK
+#ifdef HAVE_NT_SERVICE_MANAGER
{
- int *newPort;
- int *newDebugLevel;
+ int *i;
char *newConfigFile;
- ldap_debug = 0xffff;
- if ( is_NT_Service ) CommenceStartupProcessing( NTservice, slap_set_shutdown );
- newPort = (int*)getRegParam( NULL, "Port" );
- if ( newPort != NULL )
- {
- port = *newPort;
- bind_addr.sin_port = htons(port);
- Debug ( LDAP_DEBUG_ANY, "new port from registry is: %d\n", port, 0, 0 );
+ char *newUrls;
+ char *regService = NULL;
+
+ if ( is_NT_Service ) {
+ serverName = argv[0];
+ CommenceStartupProcessing( serverName, slap_sig_shutdown );
+ if ( strcmp(serverName, SERVICE_NAME) )
+ regService = serverName;
}
- newDebugLevel = (int*)getRegParam( NULL, "DebugLevel" );
- if ( newDebugLevel != NULL )
+
+ i = (int*)getRegParam( regService, "DebugLevel" );
+ if ( i != NULL )
{
- slap_debug = *newDebugLevel;
+ slap_debug = *i;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "main: new debug level from registry is: %d\n", slap_debug ));
+#else
Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", slap_debug, 0, 0 );
+#endif
}
- newConfigFile = (char*)getRegParam( NULL, "ConfigFile" );
+
+ newUrls = (char *) getRegParam(regService, "Urls");
+ if (newUrls)
+ {
+ if (urls)
+ ch_free(urls);
+
+ urls = ch_strdup(newUrls);
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "main: new urls from registry: %s\n", urls ));
+#else
+ Debug(LDAP_DEBUG_ANY, "new urls from registry: %s\n",
+ urls, 0, 0);
+#endif
+
+ }
+
+ newConfigFile = (char*)getRegParam( regService, "ConfigFile" );
if ( newConfigFile != NULL )
{
configfile = newConfigFile;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "main: new config file from registry is: %s\n", configfile ));
+#else
Debug ( LDAP_DEBUG_ANY, "new config file from registry is: %s\n", configfile, 0, 0 );
+#endif
+
}
}
#endif
while ( (i = getopt( argc, argv,
- "d:f:ia:p:s:u"
+ "d:f:h:s:n:"
+#ifdef HAVE_CHROOT
+ "r:"
+#endif
#ifdef LOG_LOCAL4
"l:"
#endif
-#ifdef SLAPD_BDB2
- "t"
-#endif
#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
"u:g:"
-#endif
-#ifdef LDAP_CONNECTIONLESS
- "c"
-#endif
-#ifdef HAVE_WINSOCK
- "n:"
-#endif
-#ifdef HAVE_TLS
- "P:"
#endif
)) != EOF ) {
switch ( i ) {
- case 'a': /* bind address */
-#ifdef HAVE_WINSOCK
- if(!(bind_addr.sin_addr.S_un.S_addr = inet_addr(optarg)))
-#else
- if(!inet_aton(optarg, &bind_addr.sin_addr))
-#endif
- {
- fprintf(stderr, "invalid address (%s) for -a option", optarg);
- }
-#ifdef HAVE_TLS
-#ifdef HAVE_WINSOCK
- tls_bind_addr.sin_addr.S_un.S_addr = inet_addr(optarg);
-#else
- inet_aton(optarg, &tls_bind_addr.sin_addr);
-#endif
-#endif
- break;
+ case 'h': /* listen URLs */
+ if ( urls != NULL ) free( urls );
+ urls = ch_strdup( optarg );
+ break;
+ case 'd': /* set debug level and 'do not detach' flag */
+ no_detach = 1;
#ifdef LDAP_DEBUG
- case 'd': /* turn on debugging */
- if ( optarg[0] == '?' ) {
- printf( "Debug levels:\n" );
- printf( "\tLDAP_DEBUG_TRACE\t%d\n",
- LDAP_DEBUG_TRACE );
- printf( "\tLDAP_DEBUG_PACKETS\t%d\n",
- LDAP_DEBUG_PACKETS );
- printf( "\tLDAP_DEBUG_ARGS\t\t%d\n",
- LDAP_DEBUG_ARGS );
- printf( "\tLDAP_DEBUG_CONNS\t%d\n",
- LDAP_DEBUG_CONNS );
- printf( "\tLDAP_DEBUG_BER\t\t%d\n",
- LDAP_DEBUG_BER );
- printf( "\tLDAP_DEBUG_FILTER\t%d\n",
- LDAP_DEBUG_FILTER );
- printf( "\tLDAP_DEBUG_CONFIG\t%d\n",
- LDAP_DEBUG_CONFIG );
- printf( "\tLDAP_DEBUG_ACL\t\t%d\n",
- LDAP_DEBUG_ACL );
- printf( "\tLDAP_DEBUG_STATS\t%d\n",
- LDAP_DEBUG_STATS );
- printf( "\tLDAP_DEBUG_STATS2\t%d\n",
- LDAP_DEBUG_STATS2 );
- printf( "\tLDAP_DEBUG_SHELL\t%d\n",
- LDAP_DEBUG_SHELL );
- printf( "\tLDAP_DEBUG_PARSE\t%d\n",
- LDAP_DEBUG_PARSE );
- printf( "\tLDAP_DEBUG_ANY\t\t%d\n",
- LDAP_DEBUG_ANY );
- exit( 0 );
- } else {
- slap_debug |= atoi( optarg );
- }
- break;
+ slap_debug |= atoi( optarg );
#else
- case 'd': /* turn on debugging */
- fprintf( stderr,
- "must compile with LDAP_DEBUG for debugging\n" );
- break;
+ if ( atoi( optarg ) != 0 )
+ fputs( "must compile with LDAP_DEBUG for debugging\n",
+ stderr );
#endif
+ break;
case 'f': /* read config file */
configfile = ch_strdup( optarg );
break;
- case 'i': /* run from inetd */
- inetd = 1;
- break;
-
- case 'p': { /* port on which to listen */
- port = (short)atoi( optarg );
- if(! port ) {
- fprintf(stderr, "-p %s must be numeric\n", optarg);
- } else {
- bind_addr.sin_port = htons(port);
- }
- } break;
-
-#ifdef HAVE_TLS
- case 'P': { /* port on which to listen for TLS */
- tls_port = (short)atoi( optarg );
- if(! tls_port ) {
- fprintf(stderr, "-P %s must be numeric\n", optarg);
- } else {
- tls_bind_addr.sin_port = htons(tls_port);
- }
- } break;
-#endif
-
case 's': /* set syslog level */
ldap_syslog = atoi( optarg );
break;
#ifdef LOG_LOCAL4
case 'l': /* set syslog local user */
- syslogUser = cnvt_str2int( optarg, syslog_types,
- DEFAULT_SYSLOG_USER );
+ syslogUser = cnvt_str2int( optarg,
+ syslog_types, DEFAULT_SYSLOG_USER );
break;
#endif
-#ifdef LDAP_CONNECTIONLESS
- case 'c': /* do connectionless (udp) */
- udp = 1;
- break;
-#endif
-
-#ifdef SLAPD_BDB2
- case 't': /* timed server */
- serverMode = SLAP_TIMEDSERVER_MODE;
+#ifdef HAVE_CHROOT
+ case 'r':
+ if( sandbox ) free(sandbox);
+ sandbox = ch_strdup( optarg );
break;
#endif
groupname = ch_strdup( optarg );
break;
#endif /* SETUID && GETUID */
-#ifdef HAVE_WINSOCK
+
case 'n': /* NT service name */
- NTservice = ch_strdup( optarg );
+ if( serverName != NULL ) free( serverName );
+ serverName = ch_strdup( optarg );
break;
-#endif
+
default:
usage( argv[0] );
rc = 1;
}
}
+#ifdef NEW_LOGGING
+ lutil_log_initialize( argc, argv );
+#endif
+
+ lutil_set_debug_level( "slapd", slap_debug );
ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &slap_debug);
ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &slap_debug);
ldif_debug = slap_debug;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "%s", Versionstr ));
+#else
Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 );
+#endif
+
- if ( (serverName = strrchr( argv[0], *LDAP_DIRSEP )) == NULL ) {
- serverName = ch_strdup( argv[0] );
- } else {
- serverName = ch_strdup( serverName + 1 );
+ if( serverName == NULL ) {
+ if ( (serverName = strrchr( argv[0], *LDAP_DIRSEP )) == NULL ) {
+ serverName = argv[0];
+ } else {
+ serverName = serverName + 1;
+ }
}
#ifdef LOG_LOCAL4
openlog( serverName, OPENLOG_OPTIONS, syslogUser );
-#else
+#elif LOG_DEBUG
openlog( serverName, OPENLOG_OPTIONS );
#endif
+ if( slapd_daemon_init( urls ) != 0 ) {
+ rc = 1;
+ SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 );
+ goto stop;
+ }
+
+#if defined(HAVE_CHROOT)
+ if ( sandbox ) {
+ if ( chdir( sandbox ) ) {
+ perror("chdir");
+ rc = 1;
+ goto stop;
+ }
+ if ( chroot( sandbox ) ) {
+ perror("chroot");
+ rc = 1;
+ goto stop;
+ }
+ }
+#endif
+
#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
- if ( username != NULL || groupname != NULL )
+ if ( username != NULL || groupname != NULL ) {
slap_init_user( username, groupname );
+ }
+#endif
+
+ extops_init();
+
+#ifdef SLAPD_MODULES
+ if ( module_init() != 0 ) {
+ rc = 1;
+ SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 17 );
+ goto destroy;
+ }
#endif
if ( slap_init( serverMode, serverName ) != 0 ) {
goto destroy;
}
+ if ( schema_init( ) != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ "main: schema initialization error\n" ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "schema initialization error\n",
+ 0, 0, 0 );
+#endif
+
+ goto destroy;
+ }
+
if ( read_config( configfile ) != 0 ) {
rc = 1;
SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 );
goto destroy;
}
- tcps = set_socket( inetd ? NULL : &bind_addr );
- if ( tcps == -1 )
+ if ( glue_sub_init( ) != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ "main: subordinate config error\n"));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "subordinate config error\n",
+ 0, 0, 0 );
+#endif
+ goto destroy;
+ }
+
+ if ( schema_prep( ) != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ "main: schema prep error\n"));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "schema prep error\n",
+ 0, 0, 0 );
+#endif
+
goto destroy;
+ }
+
#ifdef HAVE_TLS
- tls_tcps = set_socket( inetd ? NULL : &tls_bind_addr );
- if ( tls_tcps == -1 )
+ rc = ldap_pvt_tls_init();
+ if( rc != 0) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ "main: tls init failed: %d\n", rc ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "main: TLS init failed: %d\n",
+ 0, 0, 0 );
+#endif
+ rc = 1;
+ SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
+ goto destroy;
+ }
+
+ rc = ldap_pvt_tls_init_def_ctx();
+ if( rc != 0) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ "main: tls init def ctx failed: %d\n", rc ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "main: TLS init def ctx failed: %d\n",
+ 0, 0, 0 );
+#endif
+ rc = 1;
+ SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
goto destroy;
+ }
#endif
- (void) SIGNAL( LDAP_SIGUSR1, slap_do_nothing );
- (void) SIGNAL( LDAP_SIGUSR2, slap_set_shutdown );
+ (void) SIGNAL( LDAP_SIGUSR1, slap_sig_wake );
+ (void) SIGNAL( LDAP_SIGUSR2, slap_sig_shutdown );
+
#ifdef SIGPIPE
(void) SIGNAL( SIGPIPE, SIG_IGN );
#endif
#ifdef SIGHUP
- (void) SIGNAL( SIGHUP, slap_set_shutdown );
+ (void) SIGNAL( SIGHUP, slap_sig_shutdown );
#endif
- (void) SIGNAL( SIGINT, slap_set_shutdown );
- (void) SIGNAL( SIGTERM, slap_set_shutdown );
+ (void) SIGNAL( SIGINT, slap_sig_shutdown );
+ (void) SIGNAL( SIGTERM, slap_sig_shutdown );
#ifdef LDAP_SIGCHLD
(void) SIGNAL( LDAP_SIGCHLD, wait4child );
#endif
#ifdef SIGBREAK
/* SIGBREAK is generated when Ctrl-Break is pressed. */
- (void) SIGNAL( SIGBREAK, slap_set_shutdown );
+ (void) SIGNAL( SIGBREAK, slap_sig_shutdown );
#endif
#ifndef HAVE_WINSOCK
- if(!inetd) {
-#ifdef LDAP_DEBUG
- lutil_detach( ldap_debug, 0 );
-#else
- lutil_detach( 0, 0 );
+ lutil_detach( no_detach, 0 );
+#endif /* HAVE_WINSOCK */
+
+#ifdef CSRIMALLOC
+ mal_leaktrace(1);
#endif
- }
-#endif /* HAVE_WINSOC */
- if ( slap_startup(-1) != 0 ) {
+ if ( slap_startup( NULL ) != 0 ) {
rc = 1;
- SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
+ SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 );
goto shutdown;
}
- if(!inetd) {
+ {
FILE *fp;
- args.addr = &bind_addr;
-#ifdef HAVE_TLS
- args.tls_addr = &tls_bind_addr;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "main: slapd starting.\n" ));
+#else
+ Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
#endif
- Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
if (( slapd_pid_file != NULL ) &&
(( fp = fopen( slapd_pid_file, "w" )) != NULL ))
fprintf( fp, "\n" );
fclose( fp );
}
-
- } else {
- args.addr = NULL;
-#ifdef HAVE_TLS
- args.tls_addr = NULL;
-#endif
}
- args.tcps = tcps;
-#ifdef HAVE_TLS
- args.tls_tcps = tls_tcps;
-#endif
- time( &starttime );
-#ifdef HAVE_WINSOCK
- LogSlapdStartedEvent( NTservice, slap_debug, configfile, port, udp );
+#ifdef HAVE_NT_EVENT_LOG
+ if (is_NT_Service)
+ LogSlapdStartedEvent( serverName, slap_debug, configfile, urls );
#endif
- rc = slapd_daemon( &args );
+ rc = slapd_daemon();
-#ifdef HAVE_WINSOCK
+#ifdef HAVE_NT_SERVICE_MANAGER
/* Throw away the event that we used during the startup process. */
if ( is_NT_Service )
ldap_pvt_thread_cond_destroy( &started_event );
shutdown:
/* remember an error during shutdown */
- rc |= slap_shutdown(-1);
+ rc |= slap_shutdown( NULL );
+
destroy:
/* remember an error during destroy */
rc |= slap_destroy();
+#ifdef SLAPD_MODULES
+ module_kill();
+#endif
+
+ extops_kill();
+
stop:
-#ifdef HAVE_WINSOCK
- LogSlapdStoppedEvent( NTservice );
+#ifdef HAVE_NT_EVENT_LOG
+ if (is_NT_Service)
+ LogSlapdStoppedEvent( serverName );
#endif
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ "main: slapd stopped.\n" ));
+#else
Debug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 );
-#ifdef HAVE_WINSOCK
+#endif
+
+
+#ifdef HAVE_NT_SERVICE_MANAGER
ReportSlapdShutdownComplete();
#endif
+#ifdef LOG_DEBUG
closelog();
+#endif
+ slapd_daemon_destroy();
+
+ schema_destroy();
+
+#ifdef HAVE_TLS
+ ldap_pvt_tls_destroy();
+#endif
+
+ config_destroy();
+
+#ifdef CSRIMALLOC
+ mal_dumpleaktrace( leakfile );
+#endif
MAIN_RETURN(rc);
}
#ifdef WNOHANG
errno = 0;
#ifdef HAVE_WAITPID
- while ( waitpid( (pid_t)-1, NULL, WNOHANG ) >= 0 || errno == EINTR )
+ while ( waitpid( (pid_t)-1, NULL, WNOHANG ) > 0 || errno == EINTR )
; /* NULL */
#else
- while ( wait3( NULL, WNOHANG, NULL ) >= 0 || errno == EINTR )
+ while ( wait3( NULL, WNOHANG, NULL ) > 0 || errno == EINTR )
; /* NULL */
#endif
#else
(void) wait( NULL );
#endif
- (void) SIGNAL( sig, wait4child );
+ (void) SIGNAL_REINSTALL( sig, wait4child );
errno = save_errno;
}
static int
cnvt_str2int( char *stringVal, STRDISP_P dispatcher, int defaultVal )
{
- int retVal = defaultVal;
+ int retVal = defaultVal;
STRDISP_P disp;
for (disp = dispatcher; disp->stringVal; disp++) {
- if (!strncasecmp (stringVal, disp->stringVal, disp->abbr)) {
+ if (!strncasecmp (stringVal, disp->stringVal, disp->abbr)) {
- retVal = disp->intVal;
- break;
+ retVal = disp->intVal;
+ break;
- }
+ }
}
return (retVal);
+}
-} /* cnvt_str2int */
-
-#endif /* LOG_LOCAL4 */
+#endif /* LOG_LOCAL4 */
projects / openldap / blobdiff