X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=servers%2Fslapd%2Fmain.c;h=61dc82e12186bb0210fdedbaf51460e4b5c37de8;hb=a78c03bb4a9285d5a42dc7907fc212dbf162a7c1;hp=6a96d847c0ef62c34284b30db813cbd1fa9110f7;hpb=21e081dc5b4e9f115302c4d3ab231b2caf1ad2c5;p=openldap

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 6a96d847c0..61dc82e121 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -1,24 +1,49 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 #include "portable.h"
 
 #include <stdio.h>
 
-#include <ac/signal.h>
 #include <ac/socket.h>
 #include <ac/string.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"			/* Get lutil_detach() */
+#include "lutil.h"
+#include "ldif.h"
+
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
 
 #ifdef LDAP_SIGCHLD
 static RETSIGTYPE wait4child( int sig );
 #endif
 
+#ifdef HAVE_NT_SERVICE_MANAGER
+#define MAIN_RETURN(x) return
+static struct sockaddr_in	bind_addr;
+
+#define SERVICE_EXIT( e, n )	do { \
+	if ( is_NT_Service ) { \
+		lutil_ServiceStatus.dwWin32ExitCode				= (e); \
+		lutil_ServiceStatus.dwServiceSpecificExitCode	= (n); \
+	} \
+} while ( 0 )
+
+#else
+#define SERVICE_EXIT( e, n )
+#define MAIN_RETURN(x) return(x)
+#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
@@ -34,189 +59,220 @@ const char Versionstr[] =
 #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, 0, 0 }
 };
 
 static int   cnvt_str2int( char *, STRDISP_P, int );
 
-#endif  /* LOG_LOCAL4 */
+#endif	/* LOG_LOCAL4 */
 
+static int check_config = 0;
 
 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]" );
-#if LDAP_CONNECTIONLESS
-	fprintf( stderr, " [-c]" );
-#endif
-#ifdef SLAPD_BDB2
-    fprintf( stderr, " [-t]" );
+	fprintf( stderr,
+		"usage: %s options\n", name );
+	fprintf( stderr,
+		"\t-4\t\tIPv4 only\n"
+		"\t-6\t\tIPv6 only\n"
+		"\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 run as\n"
 #endif
+		"\t-h URLs\t\tList of URLs to serve\n"
 #ifdef LOG_LOCAL4
-    fprintf( stderr, " [-l sysloguser]" );
+		"\t-l facility\tSyslog facility (default: LOCAL4)\n"
 #endif
+		"\t-n serverName\tService name\n"
+#ifdef HAVE_CHROOT
+		"\t-r directory\tSandbox directory to chroot to\n"
+#endif
+		"\t-s level\tSyslog level\n"
+		"\t-t\t\tCheck configuration file and exit\n"
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
-    fprintf( stderr, " [-u user] [-g group]" );
+		"\t-u user\t\tUser (id or name) to run as\n"
 #endif
-    fprintf( stderr, "\n" );
+    );
 }
 
-time_t starttime;
-struct sockaddr_in	bind_addr;
-
-int
-main( int argc, char **argv )
+#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;
-	int		tcps;
-#ifdef LDAP_CONNECTIONLESS
-	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
-#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
-	char		*username = NULL, *groupname = NULL;
+	
+	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		*configfile;
-	char        *serverName;
-	int         serverMode = SLAP_SERVER_MODE;
+	char	    *serverName = NULL;
+	int	    serverMode = SLAP_SERVER_MODE;
 
-	configfile = SLAPD_DEFAULT_CONFIGFILE;
+#ifdef CSRIMALLOC
+	FILE *leakfile;
+	if( ( leakfile = fopen( "slapd.leak", "w" )) == NULL ) {
+		leakfile = stderr;
+	}
+#endif
 
-	(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(LDAP_PORT);
+	sl_mem_init();
 
-	g_argc = argc;
-	g_argv = argv;
+#ifdef HAVE_NT_SERVICE_MANAGER
+	{
+		int *i;
+		char *newConfigFile;
+		char *newUrls;
+		char *regService = NULL;
+
+		if ( is_NT_Service ) {
+			serverName = argv[0];
+			lutil_CommenceStartupProcessing( serverName, slap_sig_shutdown );
+			if ( strcmp(serverName, SERVICE_NAME) )
+			    regService = serverName;
+		}
+
+		i = (int*)lutil_getRegParam( regService, "DebugLevel" );
+		if ( i != NULL ) 
+		{
+			slap_debug = *i;
+#ifdef NEW_LOGGING
+			lutil_log_initialize( argc, argv );
+			LDAP_LOG( SLAPD, INFO, 
+				"main: new debug level from registry is: %d\n", 
+				slap_debug, 0, 0 );
+#else
+			Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", slap_debug, 0, 0 );
+#endif
+		}
+
+		newUrls = (char *) lutil_getRegParam(regService, "Urls");
+		if (newUrls)
+		{
+		    if (urls)
+			ch_free(urls);
+
+		    urls = ch_strdup(newUrls);
+#ifdef NEW_LOGGING
+		    LDAP_LOG( SLAPD, INFO, 
+				"main: new urls from registry: %s\n", urls, 0, 0 );
+#else
+		    Debug(LDAP_DEBUG_ANY, "new urls from registry: %s\n",
+			  urls, 0, 0);
+#endif
+
+		}
+
+		newConfigFile = (char*)lutil_getRegParam( regService, "ConfigFile" );
+		if ( newConfigFile != NULL ) 
+		{
+			configfile = newConfigFile;
+#ifdef NEW_LOGGING
+			LDAP_LOG( SLAPD, INFO, 
+				"main: new config file from registry is: %s\n", configfile, 0, 0 );
+#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:"
+			     "d:f:h:s:n:t"
+#if LDAP_PF_INET6
+				"46"
+#endif
+#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
 			     )) != 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))
+#ifdef LDAP_PF_INET6
+		case '4':
+			slap_inet4or6 = AF_INET;
+			break;
+		case '6':
+			slap_inet4or6 = AF_INET6;
+			break;
 #endif
-			{
-				fprintf(stderr, "invalid address (%s) for -a option", optarg);
-			}
-            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 */
-				short port = (short)atoi( optarg );
-				if(! port ) {
-					fprintf(stderr, "-p %s must be numeric\n", optarg);
-				} else {
-					bind_addr.sin_port = htons(port);
-				}
-			} break;
-
 		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 );
-			break;
-#endif
-
-#ifdef LDAP_CONNECTIONLESS
-		case 'c':	/* do connectionless (udp) */
-			udp = 1;
+			syslogUser = cnvt_str2int( optarg,
+				syslog_types, DEFAULT_SYSLOG_USER );
 			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
 
@@ -232,115 +288,364 @@ main( int argc, char **argv )
 			break;
 #endif /* SETUID && GETUID */
 
+		case 'n':  /* NT service name */
+			if( serverName != NULL ) free( serverName );
+			serverName = ch_strdup( optarg );
+			break;
+
+		case 't':
+			check_config++;
+			break;
+
 		default:
 			usage( argv[0] );
-			exit( 1 );
+			rc = 1;
+			SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 15 );
+			goto stop;
 		}
 	}
 
+#ifdef NEW_LOGGING
+	lutil_log_initialize( argc, argv );
+#else
+	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;
+#endif
 
+#ifdef NEW_LOGGING
+	LDAP_LOG( SLAPD, INFO, "%s", Versionstr, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 );
+#endif
 
-	if ( (serverName = strrchr( argv[0], '/' )) == 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
 
-	tcps = set_socket( inetd ? NULL : &bind_addr );
+	if( !check_config && 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();
+	lutil_passwd_init();
+	slap_op_init();
+
+#ifdef SLAPD_MODULES
+	if ( module_init() != 0 ) {
+		rc = 1;
+		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 17 );
+		goto destroy;
+	}
+#endif
+
+	if ( slap_schema_init( ) != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, CRIT, "main: schema initialization error\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+		    "schema initialization error\n",
+		    0, 0, 0 );
+#endif
+
+		goto destroy;
+	}
+
 	if ( slap_init( serverMode, serverName ) != 0 ) {
 		rc = 1;
+		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 18 );
+		goto destroy;
+	}
+
+	if ( slap_controls_init( ) != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, CRIT, "main: controls initialization error\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+		    "controls initialization error\n",
+		    0, 0, 0 );
+#endif
+
+		goto destroy;
+	}
+
+#ifdef HAVE_TLS
+	/* Library defaults to full certificate checking. This is correct when
+	 * a client is verifying a server because all servers should have a
+	 * valid cert. But few clients have valid certs, so we want our default
+	 * to be no checking. The config file can override this as usual.
+	 */
+	rc = 0;
+	(void) ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &rc );
+#endif
+
+#ifdef LDAP_SLAPI
+	if ( slapi_init() != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, CRIT, "main: slapi initialization error\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+		    "slapi initialization error\n",
+		    0, 0, 0 );
+#endif
+
+		goto destroy;
+	}
+#endif /* LDAP_SLAPI */
+
+	if ( read_config( configfile, 0 ) != 0 ) {
+		rc = 1;
+		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 );
+
+		if ( check_config ) {
+			fprintf( stderr, "config check failed\n" );
+		}
+
+		goto destroy;
+	}
+
+	if ( check_config ) {
+		rc = 0;
+		fprintf( stderr, "config check succeeded\n" );
+		goto destroy;
+	}
+
+	if ( glue_sub_init( ) != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( SLAPD, CRIT, "main: subordinate config error\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+		    "subordinate config error\n",
+		    0, 0, 0 );
+#endif
+		goto destroy;
+	}
+
+	if ( slap_schema_check( ) != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( SLAPD, CRIT, "main: schema prep error\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+		    "schema prep error\n",
+		    0, 0, 0 );
+#endif
+
+		goto destroy;
+	}
+
+#ifdef HAVE_TLS
+	rc = ldap_pvt_tls_init();
+	if( rc != 0) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( SLAPD, CRIT, "main: tls init failed: %d\n", rc, 0, 0 );
+#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;
 	}
 
-	if ( read_config( configfile ) != 0 ) {
+	rc = ldap_pvt_tls_init_def_ctx();
+	if( rc != 0) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( SLAPD, CRIT, "main: tls init def ctx failed: %d\n", rc, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+		    "main: TLS init def ctx failed: %d\n",
+		    rc, 0, 0 );
+#endif
 		rc = 1;
+		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
 		goto destroy;
 	}
+#endif
+
+	(void) SIGNAL( LDAP_SIGUSR1, slap_sig_wake );
+	(void) SIGNAL( LDAP_SIGUSR2, slap_sig_shutdown );
 
-	(void) SIGNAL( LDAP_SIGUSR1, slap_do_nothing );
-	(void) SIGNAL( LDAP_SIGUSR2, slap_set_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_sig_shutdown );
+#endif
 
-#ifndef WIN32
-	if(!inetd) {
-#ifdef LDAP_DEBUG
-		lutil_detach( ldap_debug, 0 );
-#else
-		lutil_detach( 0, 0 );
+#ifndef HAVE_WINSOCK
+	lutil_detach( no_detach, 0 );
+#endif /* HAVE_WINSOCK */
+
+#ifdef CSRIMALLOC
+	mal_leaktrace(1);
 #endif
-	}
-#endif /* WIN32 */
 
-	if ( slap_startup(-1)  != 0 ) {
+	/*
+	 * FIXME: moved here from slapd_daemon_task()
+	 * because back-monitor db_open() needs it
+	 */
+	time( &starttime );
+
+	if ( slap_startup( NULL )  != 0 ) {
 		rc = 1;
+		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 );
 		goto shutdown;
 	}
 
-	if(!inetd) {
-		FILE *fp;
+#ifdef NEW_LOGGING
+	LDAP_LOG( SLAPD, INFO, "main: slapd starting.\n", 0, 0, 0 );
+#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 ) {
+		FILE *fp = fopen( slapd_pid_file, "w" );
 
-		if (( slapd_pid_file != NULL ) &&
-			(( fp = fopen( slapd_pid_file, "w" )) != NULL ))
-		{
+		if( fp != NULL ) {
 			fprintf( fp, "%d\n", (int) getpid() );
 			fclose( fp );
+
+		} else {
+			free(slapd_pid_file);
+			slapd_pid_file = NULL;
 		}
+	}
 
-		if (( slapd_args_file != NULL ) &&
-			(( fp = fopen( slapd_args_file, "w" )) != NULL ))
-		{
+	if ( slapd_args_file != NULL ) {
+		FILE *fp = fopen( slapd_args_file, "w" );
+
+		if( fp != NULL ) {
 			for ( i = 0; i < g_argc; i++ ) {
 				fprintf( fp, "%s ", g_argv[i] );
 			}
 			fprintf( fp, "\n" );
 			fclose( fp );
+		} else {
+			free(slapd_args_file);
+			slapd_args_file = NULL;
 		}
 	}
 
-	time( &starttime );
+#ifdef HAVE_NT_EVENT_LOG
+	if (is_NT_Service)
+	lutil_LogStartedEvent( serverName, slap_debug, configfile, urls );
+#endif
 
-	rc = slapd_daemon( inetd, tcps );
+	rc = slapd_daemon();
+
+#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 );
+#endif
 
 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
+
+	slap_op_destroy();
+
+	extops_kill();
+
+stop:
+#ifdef HAVE_NT_EVENT_LOG
+	if (is_NT_Service)
+	lutil_LogStoppedEvent( serverName );
+#endif
+
+#ifdef NEW_LOGGING
+	LDAP_LOG( SLAPD, CRIT, "main: slapd stopped.\n", 0, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 );
+#endif
+
+
+#ifdef HAVE_NT_SERVICE_MANAGER
+	lutil_ReportShutdownComplete();
+#endif
+
+#ifdef LOG_DEBUG
+    closelog();
+#endif
+	slapd_daemon_destroy();
+
+	controls_destroy();
+
+	schema_destroy();
 
-	closelog();
+	lutil_passwd_destroy();
 
-	return rc;
+#ifdef HAVE_TLS
+	ldap_pvt_tls_destroy();
+#endif
+
+	if ( slapd_pid_file != NULL ) {
+		unlink( slapd_pid_file );
+	}
+	if ( slapd_args_file != NULL ) {
+		unlink( slapd_args_file );
+	}
+
+	config_destroy();
+
+#ifdef CSRIMALLOC
+	mal_dumpleaktrace( leakfile );
+#endif
+
+	MAIN_RETURN(rc);
 }
 
 
@@ -358,20 +663,20 @@ wait4child( int sig )
 #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;
 }
 
-#endif /* SIGCHLD || SIGCLD */
+#endif /* LDAP_SIGCHLD */
 
 
 #ifdef LOG_LOCAL4
@@ -384,21 +689,20 @@ wait4child( int sig )
 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 */