X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblutil%2Fntservice.c;h=6540bf20797fc0ae8e9063457c1d592b1130299d;hb=5e12c84a6f3ab84bd4d70b55e0ff3e928031d95c;hp=5672dedc120b93619cadfefa40adb16e8f760285;hpb=61c5f7a2cac6c5d7f2c8b20a53c9a62d0571a33d;p=openldap

diff --git a/libraries/liblutil/ntservice.c b/libraries/liblutil/ntservice.c
index 5672dedc12..6540bf2079 100644
--- a/libraries/liblutil/ntservice.c
+++ b/libraries/liblutil/ntservice.c
@@ -1,6 +1,13 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /* ntservice.c */
 #include "portable.h"
 
+#ifdef HAVE_NT_SERVICE_MANAGER
+
 #include <ac/stdlib.h>
 #include <ac/string.h>
 
@@ -9,7 +16,7 @@
 #include <windows.h>
 #include <winsvc.h>
 
-#include "ldap.h"
+#include <ldap.h>
 
 #define ldap_debug slap_debug
 extern int slap_debug;
@@ -71,13 +78,13 @@ int srv_install(LPCTSTR lpszServiceName, LPCTSTR lpszBinaryPathName)
 				"REG_SZ", REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, 
 				&dwDisposition) != ERROR_SUCCESS)
 			{
-				fprintf( stderr, "RegCreateKeyEx() failed. GetLastError=%d (%s)\n", GetLastError(), GetLastErrorString() );
+				fprintf( stderr, "RegCreateKeyEx() failed. GetLastError=%lu (%s)\n", GetLastError(), GetLastErrorString() );
 				RegCloseKey(hKey);
 				return(0);
 			}
 			if ( RegSetValueEx(hKey, "EventMessageFile", 0, REG_EXPAND_SZ, lpszBinaryPathName, strlen(lpszBinaryPathName) + 1) != ERROR_SUCCESS)
 			{
-				fprintf( stderr, "RegSetValueEx(EventMessageFile) failed. GetLastError=%d (%s)\n", GetLastError(), GetLastErrorString() );
+				fprintf( stderr, "RegSetValueEx(EventMessageFile) failed. GetLastError=%lu (%s)\n", GetLastError(), GetLastErrorString() );
 				RegCloseKey(hKey);
 				return(0);
 			}
@@ -85,7 +92,7 @@ int srv_install(LPCTSTR lpszServiceName, LPCTSTR lpszBinaryPathName)
 			dwValue = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE;
 			if ( RegSetValueEx(hKey, "TypesSupported", 0, REG_DWORD, (LPBYTE) &dwValue, sizeof(DWORD)) != ERROR_SUCCESS) 
 			{
-				fprintf( stderr, "RegCreateKeyEx(TypesSupported) failed. GetLastError=%d (%s)\n", GetLastError(), GetLastErrorString() );
+				fprintf( stderr, "RegCreateKeyEx(TypesSupported) failed. GetLastError=%lu (%s)\n", GetLastError(), GetLastErrorString() );
 				RegCloseKey(hKey);
 				return(0);
 			}
@@ -94,13 +101,13 @@ int srv_install(LPCTSTR lpszServiceName, LPCTSTR lpszBinaryPathName)
 		}
 		else
 		{
-			fprintf( stderr, "CreateService() failed. GetLastError=%d (%s)\n", GetLastError(), GetLastErrorString() );
+			fprintf( stderr, "CreateService() failed. GetLastError=%lu (%s)\n", GetLastError(), GetLastErrorString() );
 			CloseServiceHandle(schSCManager);
 			return(0);
 		}
 	}
 	else
-		fprintf( stderr, "OpenSCManager() failed. GetLastError=%d (%s)\n", GetLastError(), GetLastErrorString() );
+		fprintf( stderr, "OpenSCManager() failed. GetLastError=%lu (%s)\n", GetLastError(), GetLastErrorString() );
 	return(0);
 }
 
@@ -120,20 +127,20 @@ int srv_remove(LPCTSTR lpszServiceName, LPCTSTR lpszBinaryPathName)
 				CloseServiceHandle(schSCManager);
 				return(1);
 			} else {
-				fprintf( stderr, "DeleteService() failed. GetLastError=%d (%s)\n", GetLastError(), GetLastErrorString() );
+				fprintf( stderr, "DeleteService() failed. GetLastError=%lu (%s)\n", GetLastError(), GetLastErrorString() );
 				fprintf( stderr, "The %s service has not been removed.\n", lpszBinaryPathName);
 				CloseServiceHandle(schService);
 				CloseServiceHandle(schSCManager);
 				return(0);
 			}
 		} else {
-			fprintf( stderr, "OpenService() failed. GetLastError=%d (%s)\n", GetLastError(), GetLastErrorString() );
+			fprintf( stderr, "OpenService() failed. GetLastError=%lu (%s)\n", GetLastError(), GetLastErrorString() );
 			CloseServiceHandle(schSCManager);
 			return(0);
 		}
 	}
 	else
-		fprintf( stderr, "OpenSCManager() failed. GetLastError=%d (%s)\n", GetLastError(), GetLastErrorString() );
+		fprintf( stderr, "OpenSCManager() failed. GetLastError=%lu (%s)\n", GetLastError(), GetLastErrorString() );
 	return(0);
 }
 
@@ -315,7 +322,7 @@ void *getRegParam( char *svc, char *value )
 	return (void*)NULL;
 }
 
-void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, short port, int udp )
+void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, char *urls )
 {
 	char *Inserts[5];
 	WORD i = 0, j;
@@ -326,12 +333,11 @@ void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, short po
 	Inserts[i] = (char *)malloc( 20 );
 	itoa( slap_debug, Inserts[i++], 10 );
 	Inserts[i++] = ldap_pvt_strdup( configfile );
-	Inserts[i] = (char *)malloc( 20 );
-	itoa( port, Inserts[i++], 10 );
-	Inserts[i++] = ldap_pvt_strdup( udp ? "udp" : "tcp" );
+	Inserts[i++] = ldap_pvt_strdup( urls ? urls : "ldap:///" );
 	Inserts[i++] = ldap_pvt_strdup( is_NT_Service ? "svc" : "cmd" );
 
-	ReportEvent( hEventLog, EVENTLOG_INFORMATION_TYPE, 0, MSG_SLAPD_STARTED, NULL, i, 0, Inserts, NULL );
+	ReportEvent( hEventLog, EVENTLOG_INFORMATION_TYPE, 0,
+		MSG_SLAPD_STARTED, NULL, i, 0, (LPCSTR *) Inserts, NULL );
 
 	for ( j = 0; j < i; j++ )
 		ldap_memfree( Inserts[j] );
@@ -345,7 +351,8 @@ void LogSlapdStoppedEvent( char *svc )
 	HANDLE hEventLog;
 	
 	hEventLog = RegisterEventSource( NULL, svc );
-	ReportEvent( hEventLog, EVENTLOG_INFORMATION_TYPE, 0, MSG_SLAPD_STOPPED, NULL, 0, 0, NULL, NULL );
+	ReportEvent( hEventLog, EVENTLOG_INFORMATION_TYPE, 0,
+		MSG_SLAPD_STOPPED, NULL, 0, 0, NULL, NULL );
 	DeregisterEventSource( hEventLog );
 }
 
@@ -420,3 +427,5 @@ void ReportSlapdShutdownComplete(  )
 		SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
 	}
 }
+
+#endif