X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmain.c;h=6d310de8c3bd5c1a8e8bf2d9e3c9d3bd969c6742;hb=18393e882cd89e461fc804b8ef58817027e465a1;hp=aaff83fe91eef75c9179165291ce678b7d9c4401;hpb=4459780fb3abb69360ca375c0fcbac838eb7a498;p=openldap

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index aaff83fe91..6d310de8c3 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -11,19 +11,53 @@
 #include <ac/signal.h>
 #include <ac/errno.h>
 
-#include "ldapconfig.h"
+#include "ldap_defaults.h"
 #include "slap.h"
-#include "lutil.h"			/* Get lutil_detach() */
+#include "lutil.h"
 
-#if defined(SIGCHLD) || defined(SIGCLD)
+#ifdef LDAP_SIGCHLD
 static RETSIGTYPE wait4child( int sig );
 #endif
 
+#ifdef HAVE_WINSOCK
+#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;
+
+void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, char *urls );
+void LogSlapdStoppedEvent( char *svc );
+
+void CommenceStartupProcessing( LPCTSTR serviceName,
+							   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; \
+} 
+#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
  */
 
+#ifndef HAVE_MKVERSION
+const char Versionstr[] =
+	OPENLDAP_PACKAGE " " OPENLDAP_VERSION " Standalone LDAP Server (slapd)";
+#endif
+
 #ifdef LOG_LOCAL4
 
 #define DEFAULT_SYSLOG_USER  LOG_LOCAL4
@@ -56,86 +90,138 @@ static int   cnvt_str2int( char *, STRDISP_P, int );
 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,
+#if LDAP_CONNECTIONLESS
+		"\t-c\t\tEnable (experimental) Connectionless LDAP\n"
+#endif
+		"\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"
 #ifdef LOG_LOCAL4
-    fprintf( stderr, " [-l sysloguser]" );
+		"\t-l sysloguser\tSyslog User (default: LOCAL4)\n"
+#endif
+#ifdef HAVE_WINSOCK
+		"\t-n NTserviceName\tNT service name\n"
 #endif
-    fprintf( stderr, "\n" );
-}
 
-time_t starttime;
+		"\t-p port\tLDAP Port\n"
+#ifdef HAVE_TLS
+		"\t-P port\tLDAP over TLS Port\n"
+#endif
+		"\t-s level\tSyslog Level\n"
+#ifdef SLAPD_BDB2
+		"\t-t\t\tEnable BDB2 timing\n"
+#endif
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+		"\t-u user\tUser (id or name) to ran as\n"
+#endif
+    );
+}
 
-int
-main( int argc, char **argv )
+#ifdef HAVE_WINSOCK
+void WINAPI ServiceMain( DWORD argc, LPTSTR *argv )
+#else
+int main( int argc, char **argv )
+#endif
 {
 	int		i;
-	int		inetd = 0;
-	int		status, rc;
-	struct sockaddr_in	bind_addr, *slapd_addr;
-	int		udp;
+	int		rc;
+	char *urls = NULL;
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+	char *username = NULL;
+	char *groupname = NULL;
+#endif
 #ifdef LOG_LOCAL4
     int     syslogUser = DEFAULT_SYSLOG_USER;
 #endif
-	char		*configfile;
+#ifdef HAVE_WINSOCK
+	char        *NTservice  = SERVICE_NAME;
+	char		*configfile = ".\\slapd.conf";
+#else
+	char		*configfile = SLAPD_DEFAULT_CONFIGFILE;
+#endif
 	char        *serverName;
 	int         serverMode = SLAP_SERVER_MODE;
 
-	configfile = SLAPD_DEFAULT_CONFIGFILE;
-
-	(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);
+	int port = LDAP_PORT;
+#ifdef HAVE_TLS
+	int tls_port = LDAPS_PORT;
+#else
+	int tls_port = 0;
+#endif
 
 	g_argc = argc;
 	g_argv = argv;
 
+#ifdef HAVE_WINSOCK
+	{
+		int *i;
+		char *newConfigFile;
+		ldap_debug = 0xffff;
+		if ( is_NT_Service ) CommenceStartupProcessing( NTservice, slap_set_shutdown );
+		i = (int*)getRegParam( NULL, "Port" );
+		if ( i != NULL )
+		{
+			port = *i;
+			Debug ( LDAP_DEBUG_ANY, "new port from registry is: %d\n", port, 0, 0 );
+		}
+#ifdef HAVE_TLS
+		i = (int*)getRegParam( NULL, "TLSPort" );
+		if ( i != NULL )
+		{
+			tls_port = *i;
+			Debug ( LDAP_DEBUG_ANY, "new TLS port from registry is: %d\n", tls_port, 0, 0 );
+		}
+#endif
+		i = (int*)getRegParam( NULL, "DebugLevel" );
+		if ( i != NULL ) 
+		{
+			slap_debug = *i;
+			Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", slap_debug, 0, 0 );
+		}
+		newConfigFile = (char*)getRegParam( NULL, "ConfigFile" );
+		if ( newConfigFile != NULL ) 
+		{
+			configfile = newConfigFile;
+			Debug ( LDAP_DEBUG_ANY, "new config file from registry is: %s\n", configfile, 0, 0 );
+		}
+	}
+#endif
+
+	while ( (i = getopt( argc, argv,
+			     "d:f:h:p:s:u"
+#ifdef LOG_LOCAL4
+			     "l:"
+#endif
 #ifdef SLAPD_BDB2
-	while ( (i = getopt( argc, argv, "d:f:ia:p:s:ut" )) != EOF ) {
-#else
-	while ( (i = getopt( argc, argv, "d:f:ia:p:s:u" )) != EOF ) {
+			     "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 */
-			if(!inet_aton(optarg, &bind_addr.sin_addr)) {
-				fprintf(stderr, "invalid address (%s) for -a option", optarg);
-			}
+		case 'h':	/* listen URLs */
+			urls = ch_strdup( optarg );
             break;
 
 #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 );
-			}
+			slap_debug |= atoi( optarg );
 			break;
 #else
 		case 'd':	/* turn on debugging */
@@ -148,33 +234,46 @@ main( int argc, char **argv )
 			configfile = ch_strdup( optarg );
 			break;
 
-		case 'i':	/* run from inetd */
-			inetd = 1;
-			break;
-
 		case 'p': {	/* port on which to listen */
-				int port = atoi( optarg );
-				if(! port ) {
+				int p = atoi( optarg );
+				if(! p ) {
 					fprintf(stderr, "-p %s must be numeric\n", optarg);
+				} else if( p < 0 || p >= 1<<16) {
+					fprintf(stderr, "-p %s invalid\n", optarg);
 				} else {
-					bind_addr.sin_port = htons(port);
+					port = p;
 				}
 			} break;
 
+#ifdef HAVE_TLS
+		case 'P': {	/* port on which to listen for TLS */
+				int p = atoi( optarg );
+				if(! p ) {
+					fprintf(stderr, "-P %s must be numeric\n", optarg);
+				} else if( p < 0 || p >= 1<<16) {
+					fprintf(stderr, "-P %s invalid\n", optarg);
+				} else {
+					tls_port = p;
+				}
+			} 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
 
-		case 'u':	/* do udp */
+#ifdef LDAP_CONNECTIONLESS
+		case 'c':	/* do connectionless (udp) */
 			udp = 1;
 			break;
+#endif
 
 #ifdef SLAPD_BDB2
 		case 't':  /* timed server */
@@ -182,19 +281,38 @@ main( int argc, char **argv )
 			break;
 #endif
 
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+		case 'u':	/* user name */
+			if( username ) free(username);
+			username = ch_strdup( optarg );
+			break;
+
+		case 'g':	/* group name */
+			if( groupname ) free(groupname);
+			groupname = ch_strdup( optarg );
+			break;
+#endif /* SETUID && GETUID */
+
+#ifdef HAVE_WINSOCK
+		case 'n':  /* NT service name */
+			NTservice = ch_strdup( optarg );
+			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);
+	ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &slap_debug);
 	ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &slap_debug);
 	ldif_debug = slap_debug;
 
 	Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 );
 
-	if ( (serverName = strrchr( argv[0], '/' )) == NULL ) {
+	if ( (serverName = strrchr( argv[0], *LDAP_DIRSEP )) == NULL ) {
 		serverName = ch_strdup( argv[0] );
 	} else {
 		serverName = ch_strdup( serverName + 1 );
@@ -206,16 +324,35 @@ main( int argc, char **argv )
 	openlog( serverName, OPENLOG_OPTIONS );
 #endif
 
+	if( slapd_daemon_init( urls, port, tls_port ) != 0 ) {
+		rc = 1;
+		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 );
+		goto stop;
+	}
+
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+	if ( username != NULL || groupname != NULL ) {
+		slap_init_user( username, groupname );
+	}
+#endif
+
 	if ( slap_init( serverMode, serverName ) != 0 ) {
 		rc = 1;
+		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 18 );
 		goto destroy;
 	}
 
 	if ( read_config( configfile ) != 0 ) {
 		rc = 1;
+		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 );
 		goto destroy;
 	}
 
+#ifdef HAVE_TLS
+	ldap_pvt_tls_init();
+	ldap_pvt_tls_init_def_ctx();
+#endif
+
 	(void) SIGNAL( LDAP_SIGUSR1, slap_do_nothing );
 	(void) SIGNAL( LDAP_SIGUSR2, slap_set_shutdown );
 #ifdef SIGPIPE
@@ -226,30 +363,31 @@ main( int argc, char **argv )
 #endif
 	(void) SIGNAL( SIGINT, slap_set_shutdown );
 	(void) SIGNAL( SIGTERM, slap_set_shutdown );
-#ifdef SIGCHLD
-	(void) SIGNAL( SIGCHLD, wait4child );
-#elif defined(SIGCLD)
-	(void) SIGNAL( SIGCLD, wait4child );
+#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 );
 #endif
 
-	if(!inetd) {
+#ifndef HAVE_WINSOCK
 #ifdef LDAP_DEBUG
 		lutil_detach( ldap_debug, 0 );
 #else
 		lutil_detach( 0, 0 );
 #endif
-	}
+#endif /* HAVE_WINSOCK */
 
 	if ( slap_startup(-1)  != 0 ) {
 		rc = 1;
+		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
 		goto shutdown;
 	}
 
-	if(!inetd) {
+	{
 		FILE *fp;
 
-		slapd_addr = &bind_addr;
-
 		Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
 
 		if (( slapd_pid_file != NULL ) &&
@@ -268,14 +406,19 @@ main( int argc, char **argv )
 			fprintf( fp, "\n" );
 			fclose( fp );
 		}
-
-	} else {
-		slapd_addr = NULL;
 	}
 
-	time( &starttime );
+#ifdef HAVE_WINSOCK
+	LogSlapdStartedEvent( NTservice, slap_debug, configfile, urls );
+#endif
 
-	rc = slapd_daemon( slapd_addr );
+	rc = slapd_daemon();
+
+#ifdef HAVE_WINSOCK
+	/* 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 */
@@ -284,13 +427,25 @@ destroy:
 	/* remember an error during destroy */
 	rc |= slap_destroy();
 
+stop:
+#ifdef HAVE_WINSOCK
+	LogSlapdStoppedEvent( NTservice );
+#endif
+
 	Debug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 );
 
-	return rc;
+#ifdef HAVE_WINSOCK
+	ReportSlapdShutdownComplete();
+#endif
+
+    closelog();
+	slapd_daemon_destroy();
+
+	MAIN_RETURN(rc);
 }
 
 
-#if defined(SIGCHLD) || defined(SIGCLD)
+#ifdef LDAP_SIGCHLD
 
 /*
  *  Catch and discard terminated child processes, to avoid zombies.
@@ -300,23 +455,20 @@ static RETSIGTYPE
 wait4child( int sig )
 {
     int save_errno = errno;
+
+#ifdef WNOHANG
     errno = 0;
-    /*
-     * ### The wait3 vs. waitpid choice needs improvement.
-     * ### There are apparently systems where waitpid(-1, ...) fails, and
-     * ### others where waitpid should preferred over wait3 for some reason.
-     * ### Now wait3 is only here for reference, configure does not detect it.
-     */
-#if defined(HAVE_WAITPID) && defined(WNOHANG)
+#ifdef HAVE_WAITPID
     while ( waitpid( (pid_t)-1, NULL, WNOHANG ) >= 0 || errno == EINTR )
 	;	/* NULL */
-#elif defined(HAVE_WAIT3) && defined(WNOHANG)
+#else
     while ( wait3( NULL, WNOHANG, NULL ) >= 0 || errno == EINTR )
 	;	/* NULL */
+#endif
 #else
     (void) wait( NULL );
 #endif
-    (void) signal( sig, wait4child );
+    (void) SIGNAL( sig, wait4child );
     errno = save_errno;
 }
 
@@ -347,7 +499,6 @@ cnvt_str2int( char *stringVal, STRDISP_P dispatcher, int defaultVal )
     }
 
     return (retVal);
-
-} /* cnvt_str2int */
+}
 
 #endif  /* LOG_LOCAL4 */