X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fnt_svc.c;h=9be80c9e409dd34d222957872626591979fc0b99;hb=e25f6ef0cdd1780577dffeaca8ba8b19b5697880;hp=5c2a07deb4b23595018e32780906f3a3a4980b17;hpb=07e5656797d8b51d3c2373eaa3959ca437e7301b;p=openldap

diff --git a/servers/slapd/nt_svc.c b/servers/slapd/nt_svc.c
index 5c2a07deb4..9be80c9e40 100644
--- a/servers/slapd/nt_svc.c
+++ b/servers/slapd/nt_svc.c
@@ -1,56 +1,50 @@
-// nt_main.c
+/* $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/signal.h>
-//#include <ac/errno.h>
-
-#include "ldap_defaults.h"
 #include "slap.h"
+#include "lutil.h"
 
-/* kludge a path for now */
-#include "../../libraries/liblutil/slapdmsg.h"
-
-#define SCM_NOTIFICATION_INTERVAL	5000
-#define THIRTY_SECONDS				(30 * 1000)
+#ifdef HAVE_NT_SERVICE_MANAGER
 
-ldap_pvt_thread_cond_t	started_event,		stopped_event;
-ldap_pvt_thread_t		start_status_tid,	stop_status_tid;
-
-
-// in main.c
+/* in main.c */
 void WINAPI ServiceMain( DWORD argc, LPTSTR *argv );
 
-
-// in wsa_err.c
-char *WSAGetLastErrorString( void );
-
-// in nt_err.c
-char *GetLastErrorString( void );
-
-// in ntservice.c
-int srv_install( char* service, char* filename );
+/* in ntservice.c */
+int srv_install( char* service, char * displayName, char* filename,
+		 BOOL auto_start );
 int srv_remove ( char* service, char* filename );
+DWORD svc_installed (LPTSTR lpszServiceName, LPTSTR lpszBinaryPathName);
+DWORD svc_running (LPTSTR lpszServiceName);
 
-void main( DWORD argc, LPTSTR *argv )
+int main( int argc, LPTSTR *argv )
 {
 	int		length;
 	char	filename[MAX_PATH], *fname_start;
-	extern int is_NT_Service;
+
+	/*
+	 * Because the service was registered as SERVICE_WIN32_OWN_PROCESS,
+	 * the lpServiceName element of the SERVICE_TABLE_ENTRY will be
+	 * ignored. Since we don't even know the name of the service at
+	 * this point (since it could have been installed under a name
+	 * different than SERVICE_NAME), we might as well just provide
+	 * the parameter as "".
+	 */
 
 	SERVICE_TABLE_ENTRY		DispatchTable[] = {
-		{	SERVICE_NAME,	(LPSERVICE_MAIN_FUNCTION) ServiceMain	},
+		{	"",	(LPSERVICE_MAIN_FUNCTION) ServiceMain	},
 		{	NULL,			NULL	}
 	};
 
+	/*
 	// set the service's current directory to being the installation directory for the service.
 	// this way we don't have to write absolute paths in the configuration files
+	*/
 	GetModuleFileName( NULL, filename, sizeof( filename ) );
 	fname_start = strrchr( filename, *LDAP_DIRSEP );
 	*fname_start = '\0';
@@ -60,20 +54,30 @@ void main( DWORD argc, LPTSTR *argv )
 		if ( _stricmp( "install", argv[1] ) == 0 ) 
 		{
 			char *svcName = SERVICE_NAME;
+			char *displayName = "OpenLDAP Directory Service";
+			BOOL auto_start = FALSE;
+
 			if ( (argc > 2) && (argv[2] != NULL) )
 				svcName = argv[2];
+
+			if ( argc > 3 && argv[3])
+				displayName = argv[3];
+
+			if ( argc > 4 && stricmp(argv[4], "auto") == 0)
+				auto_start = TRUE;
+
 			if ( (length = GetModuleFileName(NULL, filename, sizeof( filename ))) == 0 ) 
 			{
 				fputs( "unable to retrieve file name for the service.\n", stderr  );
-				return;
+				return EXIT_FAILURE;
 			}
-			if ( !srv_install(svcName, filename) ) 
+			if ( !srv_install(svcName, displayName, filename, auto_start) ) 
 			{
 				fputs( "service failed installation ...\n", stderr  );
-				return;
+				return EXIT_FAILURE;
 			}
 			fputs( "service has been installed ...\n", stderr  );
-			return;
+			return EXIT_SUCCESS;
 		}
 
 		if ( _stricmp( "remove", argv[1] ) == 0 ) 
@@ -84,22 +88,28 @@ void main( DWORD argc, LPTSTR *argv )
 			if ( (length = GetModuleFileName(NULL, filename, sizeof( filename ))) == 0 ) 
 			{
 				fputs( "unable to retrieve file name for the service.\n", stderr  );
-				return;
+				return EXIT_FAILURE;
 			}
 			if ( !srv_remove(svcName, filename) ) 
 			{
 				fputs( "failed to remove the service ...\n", stderr  );
-				return;
+				return EXIT_FAILURE;
 			}
 			fputs( "service has been removed ...\n", stderr );
-			return;
+			return EXIT_SUCCESS;
 		}
 	}
 
 	puts( "starting slapd..." );
-	if ( !StartServiceCtrlDispatcher(DispatchTable) )
+	if (svc_installed(SERVICE_NAME, NULL) != 0
+		|| svc_running(SERVICE_NAME) == 1
+		|| StartServiceCtrlDispatcher(DispatchTable) == 0 )
 	{
 		is_NT_Service = 0;
 		ServiceMain( argc, argv );
 	}
+
+	return EXIT_SUCCESS;
 }
+
+#endif