X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fnt_svc.c;h=ce3480602cfd2cee72c4408e1816b2b1ec02dba8;hb=21fee6a7f1291cafa1468473a1924751d594d667;hp=19d385c95cceec4f121d727561b428b196c40750;hpb=58eb1534f98b35446007a295b6e24d9cf43491d3;p=openldap

diff --git a/servers/slapd/nt_svc.c b/servers/slapd/nt_svc.c
index 19d385c95c..ce3480602c 100644
--- a/servers/slapd/nt_svc.c
+++ b/servers/slapd/nt_svc.c
@@ -1,79 +1,72 @@
 /* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 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 the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
 
 #include "portable.h"
-
-#include <ldap.h>
-
-static void stubs()
-{
-    ldap_add_s(NULL, NULL, NULL);
-    ldap_bind_s(NULL, NULL, NULL, 0);
-    ldap_delete_s(NULL, NULL);
-    ldap_first_attribute(NULL, NULL, NULL);
-    ldap_first_entry(NULL, NULL);
-    ldap_get_dn(NULL, NULL);
-    ldap_get_option(NULL, 0, NULL);
-    ldap_get_values_len(NULL, NULL, NULL);
-    ldap_init(NULL, 0);
-    ldap_modify_s(NULL, NULL, NULL);
-    ldap_modrdn_s(NULL, NULL, NULL);
-    ldap_msgfree(NULL);
-    ldap_next_attribute(NULL, NULL, NULL);
-    ldap_result(NULL, 0, 0, NULL, NULL);
-    ldap_search(NULL, NULL, 0, NULL, NULL, 0);
-    ldap_unbind(NULL);
-}
-
-#ifdef HAVE_NT_SERVICE_MANAGER
-
 #include <stdio.h>
 #include <ac/string.h>
-
 #include "slap.h"
+#include "lutil.h"
 
-ldap_pvt_thread_cond_t	started_event,		stopped_event;
-ldap_pvt_thread_t		start_status_tid,	stop_status_tid;
-
+#ifdef HAVE_NT_SERVICE_MANAGER
 
 /* in main.c */
 void WINAPI ServiceMain( DWORD argc, LPTSTR *argv );
 
 /* in ntservice.c */
-int srv_install( char* service, char* filename );
-int srv_remove ( char* service, char* filename );
-
 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.
+	 */
 
 	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
-	*/
+	 * set the service's current directory to 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';
-	SetCurrentDirectory( filename );
 
 	if ( argc > 1 ) {
 		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 ( (length = GetModuleFileName(NULL, filename, sizeof( filename ))) == 0 ) 
-			{
-				fputs( "unable to retrieve file name for the service.\n", stderr  );
-				return EXIT_FAILURE;
-			}
-			if ( !srv_install(svcName, filename) ) 
+
+			if ( argc > 3 && argv[3])
+				displayName = argv[3];
+
+			if ( argc > 4 && stricmp(argv[4], "auto") == 0)
+				auto_start = TRUE;
+
+			strcat(filename, " service");
+			if ( !lutil_srv_install(svcName, displayName, filename, auto_start) ) 
 			{
 				fputs( "service failed installation ...\n", stderr  );
 				return EXIT_FAILURE;
@@ -87,12 +80,7 @@ int main( int argc, LPTSTR *argv )
 			char *svcName = SERVICE_NAME;
 			if ( (argc > 2) && (argv[2] != NULL) )
 				svcName = argv[2];
-			if ( (length = GetModuleFileName(NULL, filename, sizeof( filename ))) == 0 ) 
-			{
-				fputs( "unable to retrieve file name for the service.\n", stderr  );
-				return EXIT_FAILURE;
-			}
-			if ( !srv_remove(svcName, filename) ) 
+			if ( !lutil_srv_remove(svcName, filename) ) 
 			{
 				fputs( "failed to remove the service ...\n", stderr  );
 				return EXIT_FAILURE;
@@ -100,12 +88,19 @@ int main( int argc, LPTSTR *argv )
 			fputs( "service has been removed ...\n", stderr );
 			return EXIT_SUCCESS;
 		}
+		if ( _stricmp( "service", argv[1] ) == 0 )
+		{
+			is_NT_Service = 1;
+			*fname_start = '\0';
+			SetCurrentDirectory( filename );
+		}
 	}
 
-	puts( "starting slapd..." );
-	if ( !StartServiceCtrlDispatcher(DispatchTable) )
+	if (is_NT_Service)
+	{
+		StartServiceCtrlDispatcher(DispatchTable);
+	} else
 	{
-		is_NT_Service = 0;
 		ServiceMain( argc, argv );
 	}