X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmain.c;h=de931e49088dd0318cf6b010e6556abb2f6b8520;hb=f8c0481dd47a78d24a57e9872e8b775a7152b4d2;hp=10e14d7fb500c2c19e9e9acd3c2e8445673113a1;hpb=fa81f43f04fd8956fff6ceeba3ec9e8fde62afe4;p=openldap

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 10e14d7fb5..de931e4908 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -1,139 +1,266 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 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/errno.h>
+
+#include "ldap_pvt.h"
 
-#include "ldapconfig.h"
 #include "slap.h"
-#include "lutil.h"			/* Get lutil_detach() */
+#include "lutil.h"
+#include "ldif.h"
+
+#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;
+
+void CommenceStartupProcessing( LPCTSTR serverName,
+							   void(*stopper)(int));
+void ReportSlapdShutdownComplete( void );
+void *getRegParam( char *svc, char *value );
+
+#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
+
+#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
  */
 
+#ifndef HAVE_MKVERSION
+const char Versionstr[] =
+	OPENLDAP_PACKAGE " " OPENLDAP_VERSION " Standalone LDAP Server (slapd)";
+#endif
+
 #ifdef LOG_LOCAL4
 
 #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 int check_config = 0;
 
 static void
 usage( char *name )
 {
-	fprintf( stderr, "usage: %s [-d ?|debuglevel] [-f configfile] [-p portnumber] [-s sysloglevel]", name );
+	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
-    fprintf( stderr, "\n" );
+		"\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)
+		"\t-u user\t\tUser (id or name) to run as\n"
+#endif
+    );
 }
 
-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 = 0;
-	int		port;
-	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
+	
+	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;
-	port = LDAP_PORT;
-	g_argc = argc;
-	g_argv = argv;
+#ifdef CSRIMALLOC
+	FILE *leakfile;
+	if( ( leakfile = fopen( "slapd.leak", "w" )) == NULL ) {
+		leakfile = stderr;
+	}
+#endif
+
+
+#ifdef HAVE_NT_SERVICE_MANAGER
+	{
+		int *i;
+		char *newConfigFile;
+		char *newUrls;
+		char *regService = NULL;
+
+		if ( is_NT_Service ) {
+			serverName = argv[0];
+			CommenceStartupProcessing( serverName, slap_sig_shutdown );
+			if ( strcmp(serverName, SERVICE_NAME) )
+			    regService = serverName;
+		}
+
+		i = (int*)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 *) getRegParam(regService, "Urls");
+		if (newUrls)
+		{
+		    if (urls)
+			ch_free(urls);
 
-#ifdef SLAPD_BDB2
-	while ( (i = getopt( argc, argv, "d:f:ip:s:ut" )) != EOF ) {
+		    urls = ch_strdup(newUrls);
+#ifdef NEW_LOGGING
+		    LDAP_LOG( SLAPD, INFO, 
+				"main: new urls from registry: %s\n", urls, 0, 0 );
 #else
-	while ( (i = getopt( argc, argv, "d:f:ip:s:u" )) != EOF ) {
+		    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( 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:h:s:n:t"
+#if LDAP_PF_INET6
+				"46"
 #endif
+#ifdef HAVE_CHROOT
+				"r:"
+#endif
+#ifdef LOG_LOCAL4
+			     "l:"
+#endif
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+			     "u:g:"
+#endif
+			     )) != EOF ) {
 		switch ( i ) {
-#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 );
-			}
+#ifdef LDAP_PF_INET6
+		case '4':
+			slap_inet4or6 = AF_INET;
 			break;
-#else
-		case 'd':	/* turn on debugging */
-			fprintf( stderr,
-			    "must compile with LDAP_DEBUG for debugging\n" );
+		case '6':
+			slap_inet4or6 = AF_INET6;
 			break;
 #endif
 
-		case 'f':	/* read config file */
-			configfile = ch_strdup( optarg );
-			break;
+		case 'h':	/* listen URLs */
+			if ( urls != NULL ) free( urls );
+			urls = ch_strdup( optarg );
+	    break;
 
-		case 'i':	/* run from inetd */
-			inetd = 1;
+		case 'd':	/* set debug level and 'do not detach' flag */
+			no_detach = 1;
+#ifdef LDAP_DEBUG
+			slap_debug |= atoi( optarg );
+#else
+			if ( atoi( optarg ) != 0 )
+				fputs( "must compile with LDAP_DEBUG for debugging\n",
+				       stderr );
+#endif
 			break;
 
-		case 'p':	/* port on which to listen */
-			port = atoi( optarg );
+		case 'f':	/* read config file */
+			configfile = ch_strdup( optarg );
 			break;
 
 		case 's':	/* set syslog level */
@@ -141,195 +268,368 @@ main( int argc, char **argv )
 			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 HAVE_CHROOT
+		case 'r':
+			if( sandbox ) free(sandbox);
+			sandbox = ch_strdup( optarg );
+			break;
 #endif
 
-		case 'u':	/* do udp */
-			udp = 1;
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+		case 'u':	/* user name */
+			if( username ) free(username);
+			username = ch_strdup( optarg );
 			break;
 
-#ifdef SLAPD_BDB2
-		case 't':  /* timed server */
-			serverMode = SLAP_TIMEDSERVER_MODE;
+		case 'g':	/* group name */
+			if( groupname ) free(groupname);
+			groupname = ch_strdup( optarg );
+			break;
+#endif /* SETUID && GETUID */
+
+		case 'n':  /* NT service name */
+			if( serverName != NULL ) free( serverName );
+			serverName = ch_strdup( optarg );
+			break;
+
+		case 't':
+			check_config++;
 			break;
-#endif
 
 		default:
 			usage( argv[0] );
-			exit( 1 );
+			rc = 1;
+			SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 15 );
+			goto stop;
 		}
 	}
 
-	lber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &slap_debug);
+#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
 
+	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 ) {
+		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 ) {
 		rc = 1;
+		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 18 );
+		goto destroy;
+	}
+
+	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;
 	}
 
+#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
+
 	if ( read_config( configfile ) != 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 ( slap_startup(-1)  != 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",
+		    0, 0, 0 );
+#endif
 		rc = 1;
-		goto shutdown;
+		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
+		goto destroy;
 	}
+#endif
 
-	if ( ! inetd ) {
-		int		status;
+	(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 );
+	(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 );
-
-#ifdef LDAP_DEBUG
-		lutil_detach( ldap_debug, 0 );
-#else
-		lutil_detach( 0, 0 );
+	(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
 
-		time( &starttime );
+#ifndef HAVE_WINSOCK
+	lutil_detach( no_detach, 0 );
+#endif /* HAVE_WINSOCK */
 
-		status = ldap_pvt_thread_create( &listener_tid, 0,
-						 slapd_daemon, (void *) port );
-		if ( status != 0 )
-		{
-			Debug( LDAP_DEBUG_ANY,
-			    "listener ldap_pvt_thread_create failed (%d)\n", status, 0, 0 );
+#ifdef CSRIMALLOC
+	mal_leaktrace(1);
+#endif
 
-			rc = 1;
+	if ( slap_startup( NULL )  != 0 ) {
+		rc = 1;
+		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 );
+		goto shutdown;
+	}
 
-		} else {
-			/* wait for the listener thread to complete */
-			ldap_pvt_thread_join( listener_tid, (void *) NULL );
-		}
+	{
+		FILE *fp;
 
-	} else {
-		Connection		c;
-		BerElement		ber;
-		unsigned long		len, tag;
-		long			msgid;
-		int			flen;
-		struct sockaddr_in	from;
-		struct hostent		*hp;
-
-		c.c_dn = NULL;
-		c.c_cdn = NULL;
-		c.c_ops = NULL;
-	   
-		lber_pvt_sb_init( &c.c_sb );
-		lber_pvt_sb_set_desc( &c.c_sb, 0 );
-		lber_pvt_sb_set_io( &c.c_sb, 
-			(udp) ? &lber_pvt_sb_io_udp : &lber_pvt_sb_io_tcp, 
-			NULL );
-	   	/* FIXME: handle udp here */
-
-		ldap_pvt_thread_mutex_init( &c.c_dnmutex );
-		ldap_pvt_thread_mutex_init( &c.c_opsmutex );
-		ldap_pvt_thread_mutex_init( &c.c_pdumutex );
-#ifdef notdefcldap
-		c.c_sb.sb_addrs = (void **) saddrlist;
-		c.c_sb.sb_fromaddr = &faddr;
-		c.c_sb.sb_useaddr = saddrlist[ 0 ] = &saddr;
-#endif
-		flen = sizeof(from);
-		if ( getpeername( 0, (struct sockaddr *) &from, &flen ) == 0 ) {
-#ifdef SLAPD_RLOOKUPS
-			hp = gethostbyaddr( (char *) &(from.sin_addr.s_addr),
-			    sizeof(from.sin_addr.s_addr), AF_INET );
+#ifdef NEW_LOGGING
+		LDAP_LOG( SLAPD, INFO, "main: slapd starting.\n", 0, 0, 0 );
 #else
-			hp = NULL;
+		Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
 #endif
 
-			Debug( LDAP_DEBUG_ARGS, "connection from %s (%s)\n",
-			    hp == NULL ? "unknown" : hp->h_name,
-			    inet_ntoa( from.sin_addr ), 0 );
 
-			c.c_addr = inet_ntoa( from.sin_addr );
-			c.c_domain = ch_strdup( hp == NULL ? "" : hp->h_name );
-		} else {
-			Debug( LDAP_DEBUG_ARGS, "connection from unknown\n",
-			    0, 0, 0 );
+		if (( slapd_pid_file != NULL ) &&
+			(( fp = fopen( slapd_pid_file, "w" )) != NULL ))
+		{
+			fprintf( fp, "%d\n", (int) getpid() );
+			fclose( fp );
 		}
 
-		c.c_state = SLAP_C_ACTIVE;
-
-		ber_init_w_nullc( &ber, 0 );
-
-		while ( (tag = ber_get_next( &c.c_sb, &len, &ber ))
-		    == LDAP_TAG_MESSAGE ) {
-			ldap_pvt_thread_mutex_lock( &currenttime_mutex );
-			time( &currenttime );
-			ldap_pvt_thread_mutex_unlock( &currenttime_mutex );
-
-			if ( (tag = ber_get_int( &ber, &msgid ))
-			    != LDAP_TAG_MSGID ) {
-				/* log and send error */
-				Debug( LDAP_DEBUG_ANY,
-				   "ber_get_int returns 0x%lx\n", tag, 0, 0 );
-				ber_free( &ber, 1 );
-				return 1;
+		if (( slapd_args_file != NULL ) &&
+			(( fp = fopen( slapd_args_file, "w" )) != NULL ))
+		{
+			for ( i = 0; i < g_argc; i++ ) {
+				fprintf( fp, "%s ", g_argv[i] );
 			}
+			fprintf( fp, "\n" );
+			fclose( fp );
+		}
+	}
 
-			if ( (tag = ber_peek_tag( &ber, &len ))
-			    == LBER_ERROR ) {
-				/* log, close and send error */
-				Debug( LDAP_DEBUG_ANY,
-				   "ber_peek_tag returns 0x%lx\n", tag, 0, 0 );
-				ber_free( &ber, 1 );
-			   	lber_pvt_sb_close( &c.c_sb );
-			   	lber_pvt_sb_destroy( &c.c_sb );
-				return 1;
-			}
+#ifdef HAVE_NT_EVENT_LOG
+	if (is_NT_Service)
+	LogSlapdStartedEvent( serverName, slap_debug, configfile, urls );
+#endif
 
-			connection_activity( &c );
+	rc = slapd_daemon();
 
-			ber_free( &ber, 1 );
-		}
-	}
+#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
+
+	extops_kill();
+
+stop:
+#ifdef HAVE_NT_EVENT_LOG
+	if (is_NT_Service)
+	LogSlapdStoppedEvent( 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
+	ReportSlapdShutdownComplete();
+#endif
+
+#ifdef LOG_DEBUG
+    closelog();
+#endif
+	slapd_daemon_destroy();
 
-	return rc;
+	schema_destroy();
+
+#ifdef HAVE_TLS
+	ldap_pvt_tls_destroy();
+#endif
+
+	config_destroy();
+
+#ifdef CSRIMALLOC
+	mal_dumpleaktrace( leakfile );
+#endif
+
+	MAIN_RETURN(rc);
+}
+
+
+#ifdef LDAP_SIGCHLD
+
+/*
+ *  Catch and discard terminated child processes, to avoid zombies.
+ */
+
+static RETSIGTYPE
+wait4child( int sig )
+{
+    int save_errno = errno;
+
+#ifdef WNOHANG
+    errno = 0;
+#ifdef HAVE_WAITPID
+    while ( waitpid( (pid_t)-1, NULL, WNOHANG ) > 0 || errno == EINTR )
+	;	/* NULL */
+#else
+    while ( wait3( NULL, WNOHANG, NULL ) > 0 || errno == EINTR )
+	;	/* NULL */
+#endif
+#else
+    (void) wait( NULL );
+#endif
+    (void) SIGNAL_REINSTALL( sig, wait4child );
+    errno = save_errno;
 }
 
+#endif /* SIGCHLD || SIGCLD */
+
 
 #ifdef LOG_LOCAL4
 
@@ -341,22 +641,20 @@ destroy:
 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 */