X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fnt_svc.c;h=ce3480602cfd2cee72c4408e1816b2b1ec02dba8;hb=ac3ad635ef0883d96b5424f96b2c43e13b0ad659;hp=6a003567e14405ea2a0483e80d4cbd6cfd1b7eb5;hpb=d9dbbeb87f7d40d8236602568aceaba58c9952ee;p=openldap

diff --git a/servers/slapd/nt_svc.c b/servers/slapd/nt_svc.c
index 6a003567e1..ce3480602c 100644
--- a/servers/slapd/nt_svc.c
+++ b/servers/slapd/nt_svc.c
@@ -1,7 +1,16 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 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-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"
@@ -16,12 +25,6 @@
 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 );
-DWORD svc_installed (LPTSTR lpszServiceName, LPTSTR lpszBinaryPathName);
-DWORD svc_running (LPTSTR lpszServiceName);
-
 int main( int argc, LPTSTR *argv )
 {
 	int		length;
@@ -30,10 +33,7 @@ int main( int argc, LPTSTR *argv )
 	/*
 	 * 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[] = {
@@ -42,9 +42,10 @@ 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 );
 
@@ -65,7 +66,7 @@ int main( int argc, LPTSTR *argv )
 				auto_start = TRUE;
 
 			strcat(filename, " service");
-			if ( !srv_install(svcName, displayName, filename, auto_start) ) 
+			if ( !lutil_srv_install(svcName, displayName, filename, auto_start) ) 
 			{
 				fputs( "service failed installation ...\n", stderr  );
 				return EXIT_FAILURE;
@@ -79,7 +80,7 @@ int main( int argc, LPTSTR *argv )
 			char *svcName = SERVICE_NAME;
 			if ( (argc > 2) && (argv[2] != NULL) )
 				svcName = argv[2];
-			if ( !srv_remove(svcName, filename) ) 
+			if ( !lutil_srv_remove(svcName, filename) ) 
 			{
 				fputs( "failed to remove the service ...\n", stderr  );
 				return EXIT_FAILURE;