X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Fmain.c;h=1e4a53ffcb2d322734d56b1477f043015a3e1301;hb=42d7d6d7432b87d37bfb4beba489cc141ee2edf9;hp=c2a71484faf40b8c50498d846e7178ad74047e62;hpb=59c8a88c2fd6e76012b77514c0231b2227752841;p=openldap

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index c2a71484fa..1e4a53ffcb 100644
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -9,6 +22,12 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).  Additional significant contributors
+ * include:
+ *     Howard Chu
+ */
 
 
 /* 
@@ -17,20 +36,40 @@
 
 #include "portable.h"
 
-#include <ac/stdlib.h>
-
 #include <stdio.h>
+#include <sys/stat.h>
+#include <ac/stdlib.h>
+#include <ac/unistd.h>
 
 #include "slurp.h"
 #include "globals.h"
 #include "lutil.h"
 
+#include <ldap_pvt.h>
+
+#ifdef HAVE_NT_SERVICE_MANAGER
+#define	MAIN_RETURN(x)	return
+#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
+
+#ifndef HAVE_MKVERSION
+const char Versionstr[] =
+	OPENLDAP_PACKAGE " " OPENLDAP_VERSION " Standalone LDAP Replicator (slurpd)";
+#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
 {
 #ifdef NO_THREADS
     /* Haven't yet written the non-threaded version */
@@ -38,7 +77,7 @@ main(
     return( 1 );
 #else
 
-    int			i;
+    int			i, rc = 0;
 
     /* initialize thread package */
     ldap_pvt_thread_initialize();
@@ -49,16 +88,76 @@ main(
      */
     if (( sglob = init_globals()) == NULL ) {
 	fprintf( stderr, "Out of memory initializing globals\n" );
-	exit( EXIT_FAILURE );
+	SERVICE_EXIT( ERROR_NOT_ENOUGH_MEMORY, 0 );
+	rc = 1;
+	goto stop;
     }
 
+#ifdef HAVE_NT_SERVICE_MANAGER
+	{
+		int *i;
+		char *newConfigFile;
+		char *regService = NULL;
+
+		if ( is_NT_Service ) {
+			sglob->serverName = argv[0];
+			lutil_CommenceStartupProcessing( sglob->serverName, slurp_set_shutdown );
+			if ( strcmp(sglob->serverName, SERVICE_NAME) )
+			    regService = sglob->serverName;
+		}
+
+		i = (int*)lutil_getRegParam( regService, "DebugLevel" );
+		if ( i != NULL ) 
+		{
+			ldap_debug = *i;
+#ifdef NEW_LOGGING
+			lutil_log_initialize( argc, argv );
+			LDAP_LOG( SLURPD, INFO, 
+				"main: new debug level from registry is: %d\n", 
+				ldap_debug, 0, 0 );
+#else
+			Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", ldap_debug, 0, 0 );
+#endif
+		}
+
+		newConfigFile = (char*)lutil_getRegParam( regService, "ConfigFile" );
+		if ( newConfigFile != NULL ) 
+		{
+			sglob->slapd_configfile = newConfigFile;
+#ifdef NEW_LOGGING
+			LDAP_LOG( SLURPD, INFO, 
+				"main: new config file from registry is: %s\n", sglob->slapd_configfile, 0, 0 );
+#else
+			Debug ( LDAP_DEBUG_ANY, "new config file from registry is: %s\n", sglob->slapd_configfile, 0, 0 );
+#endif
+
+		}
+	}
+#endif
+
     /*
      * Process command-line args and fill in globals.
      */
     if ( doargs( argc, argv, sglob ) < 0 ) {
-	exit( EXIT_FAILURE );
+	SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 15 );
+	rc = 1;
+	goto stop;
+    }
+
+    if ( sglob->version ) {
+		fprintf(stderr, "%s\n", Versionstr);
+		if (sglob->version > 1 ) {
+			rc = 1;
+			goto stop;
+		}
     }
 
+#ifdef NEW_LOGGING
+	LDAP_LOG( SLURPD, INFO, "%s\n", Versionstr, 0, 0 );
+#else
+	Debug ( LDAP_DEBUG_ANY, "%s\n", Versionstr, 0, 0 );
+#endif
+    
     /*
      * Read slapd config file and initialize Re (per-replica) structs.
      */
@@ -66,7 +165,28 @@ main(
 	fprintf( stderr,
 		"Errors encountered while processing config file \"%s\"\n",
 		sglob->slapd_configfile );
-	exit( EXIT_FAILURE );
+	SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 );
+	rc = 1;
+	goto stop;
+    }
+
+#ifdef HAVE_TLS
+	if( ldap_pvt_tls_init() || ldap_pvt_tls_init_def_ctx() ) {
+		fprintf( stderr, "TLS Initialization failed.\n" );
+		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
+		rc = 1;
+		goto stop;
+	}
+#endif
+
+    /* 
+     * Make sure our directory exists
+     */
+    if ( mkdir(sglob->slurpd_rdir, 0755) == -1 && errno != EEXIST) {
+	perror(sglob->slurpd_rdir);
+	SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 );
+	rc = 1;
+	goto stop;
     }
 
     /*
@@ -74,8 +194,10 @@ main(
      */
     if ( sglob->st->st_read( sglob->st )) {
 	fprintf( stderr, "Malformed slurpd status file \"%s\"\n",
-		sglob->slurpd_status_file, 0, 0 );
-	exit( EXIT_FAILURE );
+		sglob->slurpd_status_file );
+	SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 17 );
+	rc = 1;
+	goto stop;
     }
 
     /*
@@ -83,26 +205,59 @@ main(
      * Check for any fatal error conditions before we get started
      */
      if ( sanity() < 0 ) {
-	exit( EXIT_FAILURE );
+	SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 18 );
+	rc = 1;
+	goto stop;
     }
 
-    /*
-     * Detach from the controlling terminal, if debug level = 0,
-     * and if not in one-shot mode.
-     */
-#ifdef LDAP_DEBUG
-    if (( ldap_debug == 0 )  && !sglob->one_shot_mode )
-#else /* LDAP_DEBUG */
-    if ( !sglob->one_shot_mode )
-#endif /* LDAP_DEBUG */
-	lutil_detach( 0, 0 );
 
     /*
-     * Start threads - one thread for each replica
+     * Detach from the controlling terminal
+     * unless the -d flag is given or in one-shot mode.
      */
-    for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) {
-	start_replica_thread( sglob->replicas[ i ]);
+#ifndef HAVE_WINSOCK
+	if ( ! (sglob->no_detach || sglob->one_shot_mode) ) {
+		lutil_detach( 0, 0 );
+	}
+#endif
+
+	if ( slurpd_pid_file != NULL ) {
+		FILE *fp = fopen( slurpd_pid_file, "w" );
+
+		if( fp != NULL ) {
+			fprintf( fp, "%d\n", (int) getpid() );
+			fclose( fp );
+
+		} else {
+		free(slurpd_pid_file);
+		slurpd_pid_file = NULL;
+		}
+	}
+
+	if ( slurpd_args_file != NULL ) {
+		FILE *fp = fopen( slurpd_args_file, "w" );
+
+		if( fp != NULL ) {
+			for ( i = 0; i < argc; i++ ) {
+				fprintf( fp, "%s ", argv[i] );
+			}
+			fprintf( fp, "\n" );
+			fclose( fp );
+		} else {
+			free(slurpd_args_file);
+			slurpd_args_file = NULL;
+		}
+	}
+
+    if ( (rc = lutil_pair( sglob->wake_sds )) < 0 ) {
+	SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 16 );
+	rc = 1;
+	goto stop;
     }
+	
+#ifdef HAVE_NT_EVENT_LOG
+	if (is_NT_Service) lutil_LogStartedEvent( sglob->serverName, ldap_debug, sglob->slapd_configfile, "n/a" );
+#endif
 
     /*
      * Start the main file manager thread (in fm.c).
@@ -110,16 +265,43 @@ main(
     if ( ldap_pvt_thread_create( &(sglob->fm_tid),
 		0, fm, (void *) NULL ) != 0 )
 	{
+#ifdef NEW_LOGGING
+	LDAP_LOG ( SLURPD, ERR,
+		"main: file manager ldap_pvt_thread_create failed\n" , 0, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_ANY, "file manager ldap_pvt_thread_create failed\n",
 		0, 0, 0 );
-	exit( EXIT_FAILURE );
+#endif
+	SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 21 );
+	rc = 1;
+	goto stop;
+
+    }
+
+    /*
+     * wait for fm to finish if in oneshot mode
+     */
+    if ( sglob->one_shot_mode ) {
+	ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
+    }
 
+    /*
+     * Start threads - one thread for each replica
+     */
+    for ( i = 0; sglob->replicas[ i ] != NULL; i++ ) {
+	start_replica_thread( sglob->replicas[ i ]);
     }
 
+#ifdef HAVE_NT_SERVICE_MANAGER
+    if ( started_event ) ldap_pvt_thread_cond_signal( &started_event );
+#endif
+
     /*
      * Wait for the fm thread to finish.
      */
-    ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
+    if ( !sglob->one_shot_mode ) {
+	ldap_pvt_thread_join( sglob->fm_tid, (void *) NULL );
+    }
 
     /*
      * Wait for the replica threads to finish.
@@ -128,10 +310,35 @@ main(
 	ldap_pvt_thread_join( sglob->replicas[ i ]->ri_tid, (void *) NULL );
     }
 
-	/* destroy the thread package */
-	ldap_pvt_thread_destroy();
+stop:
+#ifdef HAVE_NT_SERVICE_MANAGER
+	if (is_NT_Service) {
+		ldap_pvt_thread_cond_destroy( &started_event );
+		lutil_LogStoppedEvent( sglob->serverName );
+		lutil_ReportShutdownComplete();
+	}
+#endif
+    /* destroy the thread package */
+    ldap_pvt_thread_destroy();
 
+#ifdef HAVE_TLS
+    ldap_pvt_tls_destroy();
+#endif
+
+#ifdef NEW_LOGGING
+	LDAP_LOG ( SLURPD, RESULTS, "main: slurpd terminated\n", 0, 0, 0 );
+#else
     Debug( LDAP_DEBUG_ANY, "slurpd: terminated.\n", 0, 0, 0 );
-	return 0;
+#endif
+
+    if ( slurpd_pid_file != NULL ) {
+	unlink( slurpd_pid_file );
+    }
+    if ( slurpd_args_file != NULL ) {
+	unlink( slurpd_args_file );
+    }
+
+
+	MAIN_RETURN(rc);
 #endif /* !NO_THREADS */
 }