X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fnt_svc.c;h=f6eb4401aec50da51e087bbe82104025e7ed5a02;hb=4479b4c417ebce77828f7cd2a587a7855ee8ec7c;hp=1fd82abacb6c6906d9777f345b4c1efb1d131932;hpb=2e5e4c3f20045ba6a3fea20f7b69e1dcd07bfcc8;p=openldap

diff --git a/servers/slapd/nt_svc.c b/servers/slapd/nt_svc.c
index 1fd82abacb..f6eb4401ae 100644
--- a/servers/slapd/nt_svc.c
+++ b/servers/slapd/nt_svc.c
@@ -1,13 +1,23 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 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 <stdio.h>
 #include <ac/string.h>
 #include "slap.h"
+#include "lutil.h"
 
 #ifdef HAVE_NT_SERVICE_MANAGER
 
@@ -15,23 +25,15 @@
 void WINAPI ServiceMain( DWORD argc, LPTSTR *argv );
 
 /* in ntservice.c */
-int srv_install( char* service, char * displayName, char* filename,
-		 BOOL auto_start );
-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. 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 "".
+	 * ignored.
 	 */
 
 	SERVICE_TABLE_ENTRY		DispatchTable[] = {
@@ -40,13 +42,12 @@ int main( int argc, LPTSTR *argv )
 	};
 
 	/*
-	// 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 ) 
@@ -64,12 +65,8 @@ int main( int argc, LPTSTR *argv )
 			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 EXIT_FAILURE;
-			}
-			if ( !srv_install(svcName, displayName, filename, auto_start) ) 
+			strcat(filename, " service");
+			if ( !lutil_srv_install(svcName, displayName, filename, auto_start) ) 
 			{
 				fputs( "service failed installation ...\n", stderr  );
 				return EXIT_FAILURE;
@@ -83,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;
@@ -96,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 );
 	}