]> git.sur5r.net Git - openldap/blobdiff - libraries/liblutil/ntservice.c
Merge remote branch 'origin/mdb.master'
[openldap] / libraries / liblutil / ntservice.c
index 10459c7a795befd80d61bee062cc9e917f1c18fd..23d1ea6fb195cc8e04e089ac5e2f523b529eb2df 100644 (file)
@@ -1,59 +1,77 @@
-// ntservice.c
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2012 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>.
+ */
+
+/*
+ * NT Service manager utilities for OpenLDAP services
+ */
+
 #include "portable.h"
+
+#ifdef HAVE_NT_SERVICE_MANAGER
+
+#include <ac/stdlib.h>
+#include <ac/string.h>
+
 #include <stdio.h>
+
 #include <windows.h>
-#include "ldap.h"
-#include "ldap_log.h"
-#include "ldap_pvt_thread.h"
 #include <winsvc.h>
-#include <sys/types.h>
-#include <ac/string.h>
 
-#include "ldapconfig.h"
-//#include "slap.h"
+#include <ldap.h>
+
+#include "ldap_pvt_thread.h"
+
+#include "ldap_defaults.h"
 
 #include "slapdmsg.h"
 
 #define SCM_NOTIFICATION_INTERVAL      5000
 #define THIRTY_SECONDS                         (30 * 1000)
 
-int      is_NT_Service = 1;    // assume this is an NT service until determined that 
-                                                                       // startup was from the command line
+int      is_NT_Service;        /* is this is an NT service? */
 
-SERVICE_STATUS                 SLAPDServiceStatus;
-SERVICE_STATUS_HANDLE  hSLAPDServiceStatus;
+SERVICE_STATUS                 lutil_ServiceStatus;
+SERVICE_STATUS_HANDLE  hlutil_ServiceStatus;
 
 ldap_pvt_thread_cond_t started_event,          stopped_event;
 ldap_pvt_thread_t              start_status_tid,       stop_status_tid;
 
 void (*stopfunc)(int);
 
-// in main.c
-void WINAPI ServiceMain( DWORD argc, LPTSTR *argv );
+static char *GetLastErrorString( void );
 
-
-// in wsa_err.c
-char *WSAGetLastErrorString( void );
-
-// in nt_err.c
-char *GetLastErrorString( void );
-
-int srv_install(LPCTSTR lpszServiceName, LPCTSTR lpszBinaryPathName)
+int lutil_srv_install(LPCTSTR lpszServiceName, LPCTSTR lpszDisplayName,
+               LPCTSTR lpszBinaryPathName, int auto_start)
 {
        HKEY            hKey;
        DWORD           dwValue, dwDisposition;
        SC_HANDLE       schSCManager, schService;
+       char *sp = strchr( lpszBinaryPathName, ' ');
 
+       if ( sp ) *sp = '\0';
        fprintf( stderr, "The install path is %s.\n", lpszBinaryPathName );
+       if ( sp ) *sp = ' ';
        if ((schSCManager = OpenSCManager( NULL, NULL, SC_MANAGER_CONNECT|SC_MANAGER_CREATE_SERVICE ) ) != NULL )
        {
                if ((schService = CreateService( 
                                                        schSCManager, 
                                                        lpszServiceName, 
-                                                       TEXT("OpenLDAP Directory Service")
-                                                       SC_MANAGER_CREATE_SERVICE
+                                                       lpszDisplayName
+                                                       SERVICE_ALL_ACCESS
                                                        SERVICE_WIN32_OWN_PROCESS, 
-                                                       SERVICE_DEMAND_START, 
+                                                       auto_start ? SERVICE_AUTO_START : SERVICE_DEMAND_START, 
                                                        SERVICE_ERROR_NORMAL, 
                                                        lpszBinaryPathName, 
                                                        NULL, NULL, NULL, NULL, NULL)) != NULL)
@@ -62,21 +80,23 @@ int srv_install(LPCTSTR lpszServiceName, LPCTSTR lpszBinaryPathName)
                        CloseServiceHandle(schService);
                        CloseServiceHandle(schSCManager);
 
-                       sprintf( regpath, "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\%s",
+                       snprintf( regpath, sizeof regpath,
+                               "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\%s",
                                lpszServiceName );
-                       // Create the registry key for event logging to the Windows NT event log.
+                       /* Create the registry key for event logging to the Windows NT event log. */
                        if ( RegCreateKeyEx(HKEY_LOCAL_MACHINE, 
                                regpath, 0, 
                                "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 ( sp ) *sp = '\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);
                        }
@@ -84,7 +104,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);
                        }
@@ -93,18 +113,18 @@ 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);
 }
 
 
-int srv_remove(LPCTSTR lpszServiceName, LPCTSTR lpszBinaryPathName)
+int lutil_srv_remove(LPCTSTR lpszServiceName, LPCTSTR lpszBinaryPathName)
 {
        SC_HANDLE schSCManager, schService;
 
@@ -119,24 +139,76 @@ 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);
 }
 
 
+#if 0 /* unused */
+DWORD
+svc_installed (LPTSTR lpszServiceName, LPTSTR lpszBinaryPathName)
+{
+       char buf[256];
+       HKEY key;
+       DWORD rc;
+       DWORD type;
+       long len;
+
+       strcpy(buf, TEXT("SYSTEM\\CurrentControlSet\\Services\\"));
+       strcat(buf, lpszServiceName);
+       if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, buf, 0, KEY_QUERY_VALUE, &key) != ERROR_SUCCESS)
+               return(-1);
+
+       rc = 0;
+       if (lpszBinaryPathName) {
+               len = sizeof(buf);
+               if (RegQueryValueEx(key, "ImagePath", NULL, &type, buf, &len) == ERROR_SUCCESS) {
+                       if (strcmp(lpszBinaryPathName, buf))
+                               rc = -1;
+               }
+       }
+       RegCloseKey(key);
+       return(rc);
+}
+
+
+DWORD
+svc_running (LPTSTR lpszServiceName)
+{
+       SC_HANDLE service;
+       SC_HANDLE scm;
+       DWORD rc;
+       SERVICE_STATUS ss;
+
+       if (!(scm = OpenSCManager(NULL, NULL, GENERIC_READ)))
+               return(GetLastError());
+
+       rc = 1;
+       service = OpenService(scm, lpszServiceName, SERVICE_QUERY_STATUS);
+       if (service) {
+               if (!QueryServiceStatus(service, &ss))
+                       rc = GetLastError();
+               else if (ss.dwCurrentState != SERVICE_STOPPED)
+                       rc = 0;
+               CloseServiceHandle(service);
+       }
+       CloseServiceHandle(scm);
+       return(rc);
+}
+#endif
 
 static void *start_status_routine( void *ptr )
 {
@@ -150,30 +222,30 @@ static void *start_status_routine( void *ptr )
                {
                        case WAIT_ABANDONED:
                        case WAIT_OBJECT_0:
-                               // the object that we were waiting for has been destroyed (ABANDONED) or
-                               // signalled (TIMEOUT_0). We can assume that the startup process is
-                               // complete and tell the Service Control Manager that we are now runnng
-                               SLAPDServiceStatus.dwCurrentState       = SERVICE_RUNNING;
-                               SLAPDServiceStatus.dwWin32ExitCode      = NO_ERROR;
-                               SLAPDServiceStatus.dwCheckPoint++;
-                               SLAPDServiceStatus.dwWaitHint           = 1000;
-                               SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
+                               /* the object that we were waiting for has been destroyed (ABANDONED) or
+                                * signalled (TIMEOUT_0). We can assume that the startup process is
+                                * complete and tell the Service Control Manager that we are now runnng */
+                               lutil_ServiceStatus.dwCurrentState      = SERVICE_RUNNING;
+                               lutil_ServiceStatus.dwWin32ExitCode     = NO_ERROR;
+                               lutil_ServiceStatus.dwCheckPoint++;
+                               lutil_ServiceStatus.dwWaitHint          = 1000;
+                               SetServiceStatus(hlutil_ServiceStatus, &lutil_ServiceStatus);
                                done = 1;
                                break;
                        case WAIT_TIMEOUT:
-                               // We've waited for the required time, so send an update to the Service Control 
-                               // Manager saying to wait again.
-                               SLAPDServiceStatus.dwCheckPoint++;
-                               SLAPDServiceStatus.dwWaitHint = SCM_NOTIFICATION_INTERVAL * 2;
-                               SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
+                               /* We've waited for the required time, so send an update to the Service Control 
+                                * Manager saying to wait again. */
+                               lutil_ServiceStatus.dwCheckPoint++;
+                               lutil_ServiceStatus.dwWaitHint = SCM_NOTIFICATION_INTERVAL * 2;
+                               SetServiceStatus(hlutil_ServiceStatus, &lutil_ServiceStatus);
                                break;
                        case WAIT_FAILED:
-                               // theres been some proble with WaitForSingleObject so tell the Service
-                               // Control Manager to wait 30 seconds before deploying its assasin and 
-                               // then leave the thread.
-                               SLAPDServiceStatus.dwCheckPoint++;
-                               SLAPDServiceStatus.dwWaitHint = THIRTY_SECONDS;
-                               SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
+                               /* theres been some problem with WaitForSingleObject so tell the Service
+                                * Control Manager to wait 30 seconds before deploying its assasin and 
+                                * then leave the thread. */
+                               lutil_ServiceStatus.dwCheckPoint++;
+                               lutil_ServiceStatus.dwWaitHint = THIRTY_SECONDS;
+                               SetServiceStatus(hlutil_ServiceStatus, &lutil_ServiceStatus);
                                done = 1;
                                break;
                }
@@ -196,26 +268,26 @@ static void *stop_status_routine( void *ptr )
                {
                        case WAIT_ABANDONED:
                        case WAIT_OBJECT_0:
-                               // the object that we were waiting for has been destroyed (ABANDONED) or
-                               // signalled (TIMEOUT_0). The shutting down process is therefore complete 
-                               // and the final SERVICE_STOPPED message will be sent to the service control
-                               // manager prior to the process terminating.
+                               /* the object that we were waiting for has been destroyed (ABANDONED) or
+                                * signalled (TIMEOUT_0). The shutting down process is therefore complete 
+                                * and the final SERVICE_STOPPED message will be sent to the service control
+                                * manager prior to the process terminating. */
                                done = 1;
                                break;
                        case WAIT_TIMEOUT:
-                               // We've waited for the required time, so send an update to the Service Control 
-                               // Manager saying to wait again.
-                               SLAPDServiceStatus.dwCheckPoint++;
-                               SLAPDServiceStatus.dwWaitHint = SCM_NOTIFICATION_INTERVAL * 2;
-                               SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
+                               /* We've waited for the required time, so send an update to the Service Control 
+                                * Manager saying to wait again. */
+                               lutil_ServiceStatus.dwCheckPoint++;
+                               lutil_ServiceStatus.dwWaitHint = SCM_NOTIFICATION_INTERVAL * 2;
+                               SetServiceStatus(hlutil_ServiceStatus, &lutil_ServiceStatus);
                                break;
                        case WAIT_FAILED:
-                               // theres been some proble with WaitForSingleObject so tell the Service
-                               // Control Manager to wait 30 seconds before deploying its assasin and 
-                               // then leave the thread.
-                               SLAPDServiceStatus.dwCheckPoint++;
-                               SLAPDServiceStatus.dwWaitHint = THIRTY_SECONDS;
-                               SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
+                               /* theres been some problem with WaitForSingleObject so tell the Service
+                                * Control Manager to wait 30 seconds before deploying its assasin and 
+                                * then leave the thread. */
+                               lutil_ServiceStatus.dwCheckPoint++;
+                               lutil_ServiceStatus.dwWaitHint = THIRTY_SECONDS;
+                               SetServiceStatus(hlutil_ServiceStatus, &lutil_ServiceStatus);
                                done = 1;
                                break;
                }
@@ -226,102 +298,92 @@ static void *stop_status_routine( void *ptr )
 
 
 
-void WINAPI SLAPDServiceCtrlHandler( IN DWORD Opcode)
+static void WINAPI lutil_ServiceCtrlHandler( IN DWORD Opcode)
 {
        switch (Opcode)
        {
        case SERVICE_CONTROL_STOP:
        case SERVICE_CONTROL_SHUTDOWN:
 
-               Debug( LDAP_DEBUG_TRACE, "Service Shutdown ordered\n", 0, 0 );
-               SLAPDServiceStatus.dwCurrentState       = SERVICE_STOP_PENDING;
-               SLAPDServiceStatus.dwCheckPoint++;
-               SLAPDServiceStatus.dwWaitHint           = SCM_NOTIFICATION_INTERVAL * 2;
-               SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
+               lutil_ServiceStatus.dwCurrentState      = SERVICE_STOP_PENDING;
+               lutil_ServiceStatus.dwCheckPoint++;
+               lutil_ServiceStatus.dwWaitHint          = SCM_NOTIFICATION_INTERVAL * 2;
+               SetServiceStatus(hlutil_ServiceStatus, &lutil_ServiceStatus);
 
                ldap_pvt_thread_cond_init( &stopped_event );
                if ( stopped_event == NULL )
                {
-                       // the event was not created. We will ask the service control manager for 30
-                       // seconds to shutdown
-                       SLAPDServiceStatus.dwCheckPoint++;
-                       SLAPDServiceStatus.dwWaitHint           = THIRTY_SECONDS;
-                       SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
+                       /* the event was not created. We will ask the service control manager for 30
+                        * seconds to shutdown */
+                       lutil_ServiceStatus.dwCheckPoint++;
+                       lutil_ServiceStatus.dwWaitHint          = THIRTY_SECONDS;
+                       SetServiceStatus(hlutil_ServiceStatus, &lutil_ServiceStatus);
                }
                else
                {
-                       // start a thread to report the progress to the service control manager 
-                       // until the stopped_event is fired.
+                       /* start a thread to report the progress to the service control manager 
+                        * until the stopped_event is fired. */
                        if ( ldap_pvt_thread_create( &stop_status_tid, 0, stop_status_routine, NULL ) == 0 )
                        {
                                
                        }
                        else {
-                               // failed to create the thread that tells the Service Control Manager that the
-                               // service stopping is proceeding. 
-                               // tell the Service Control Manager to wait another 30 seconds before deploying its
-                               // assasin.
-                               SLAPDServiceStatus.dwCheckPoint++;
-                               SLAPDServiceStatus.dwWaitHint = THIRTY_SECONDS;
-                               SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
+                               /* failed to create the thread that tells the Service Control Manager that the
+                                * service stopping is proceeding. 
+                                * tell the Service Control Manager to wait another 30 seconds before deploying its
+                                * assasin.  */
+                               lutil_ServiceStatus.dwCheckPoint++;
+                               lutil_ServiceStatus.dwWaitHint = THIRTY_SECONDS;
+                               SetServiceStatus(hlutil_ServiceStatus, &lutil_ServiceStatus);
                        }
                }
                stopfunc( -1 );
                break;
 
        case SERVICE_CONTROL_INTERROGATE:
-               SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
+               SetServiceStatus(hlutil_ServiceStatus, &lutil_ServiceStatus);
                break;
        }
        return;
 }
 
-
-void *getRegParam( char *svc, char *value )
+void *lutil_getRegParam( char *svc, char *value )
 {
-       HANDLE hkey;
+       HKEY hkey;
        char path[255];
-       int i = 0, rc;
-       char vName[256];
-       DWORD vNameLen = 255;
        DWORD vType;
        static char vValue[1024];
-       DWORD valLen = 1024;
+       DWORD valLen = sizeof( vValue );
 
        if ( svc != NULL )
-               sprintf ( path, "SOFTWARE\\OpenLDAP\\%s\\Parameters", svc );
+               snprintf ( path, sizeof path, "SOFTWARE\\%s", svc );
        else
-               strcpy (path, "SOFTWARE\\OpenLDAP\\Parameters" );
-
-       if( (rc = RegOpenKeyEx( HKEY_LOCAL_MACHINE,
-               path, 0, KEY_READ, &hkey )) != ERROR_SUCCESS )
+               snprintf ( path, sizeof path, "SOFTWARE\\OpenLDAP\\Parameters" );
+       
+       if ( RegOpenKeyEx( HKEY_LOCAL_MACHINE, path, 0, KEY_READ, &hkey ) != ERROR_SUCCESS )
        {
-               //Debug( LDAP_DEBUG_ANY, "%s\n", GetLastErrorString(), 0, 0 );
                return NULL;
        }
 
-       while ( !RegEnumValue( hkey, i, vName, &vNameLen, NULL,
-               &vType, vValue, &valLen ) )
+       if ( RegQueryValueEx( hkey, value, NULL, &vType, vValue, &valLen ) != ERROR_SUCCESS )
        {
-               if ( !strcasecmp( value, vName ) )
-               {
-                       switch ( vType )
-                       {
-                       case REG_BINARY:
-                       case REG_DWORD:
-                               return (void*)&vValue;
-                       case REG_SZ:
-                               return (void*)strdup( vValue );
-                       }
-               }
-               i++;
-               vNameLen = 255;
-               valLen = 1024;
+               RegCloseKey( hkey );
+               return NULL;
+       }
+       RegCloseKey( hkey );
+       
+       switch ( vType )
+       {
+       case REG_BINARY:
+       case REG_DWORD:
+               return (void*)&vValue;
+       case REG_SZ:
+               return (void*)&vValue;
        }
        return (void*)NULL;
 }
 
-void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, short port, int udp )
+void lutil_LogStartedEvent( char *svc, int slap_debug, char *configfile, char *urls )
 {
        char *Inserts[5];
        WORD i = 0, j;
@@ -331,13 +393,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( is_NT_Service ? "svc" : "cmd" );
+       Inserts[i++] = strdup( configfile );
+       Inserts[i++] = strdup( urls ? urls : "ldap:///" );
 
-       ReportEvent( hEventLog, EVENTLOG_INFORMATION_TYPE, 0, MSG_SLAPD_STARTED, NULL, i, 0, Inserts, NULL );
+       ReportEvent( hEventLog, EVENTLOG_INFORMATION_TYPE, 0,
+               MSG_SVC_STARTED, NULL, i, 0, (LPCSTR *) Inserts, NULL );
 
        for ( j = 0; j < i; j++ )
                ldap_memfree( Inserts[j] );
@@ -346,83 +406,103 @@ void LogSlapdStartedEvent( char *svc, int slap_debug, char *configfile, short po
 
 
 
-void LogSlapdStoppedEvent( char *svc )
+void lutil_LogStoppedEvent( 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_SVC_STOPPED, NULL, 0, 0, NULL, NULL );
        DeregisterEventSource( hEventLog );
 }
 
 
-void CommenceStartupProcessing( LPCTSTR lpszServiceName,
+void lutil_CommenceStartupProcessing( char *lpszServiceName,
                                                           void (*stopper)(int) )
 {
-       hSLAPDServiceStatus = RegisterServiceCtrlHandler( lpszServiceName, (LPHANDLER_FUNCTION)SLAPDServiceCtrlHandler);
+       hlutil_ServiceStatus = RegisterServiceCtrlHandler( lpszServiceName, (LPHANDLER_FUNCTION)lutil_ServiceCtrlHandler);
 
        stopfunc = stopper;
 
        /* initialize the Service Status structure */
-       SLAPDServiceStatus.dwServiceType                                = SERVICE_WIN32_OWN_PROCESS;
-       SLAPDServiceStatus.dwCurrentState                               = SERVICE_START_PENDING;
-       SLAPDServiceStatus.dwControlsAccepted                   = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
-       SLAPDServiceStatus.dwWin32ExitCode                              = NO_ERROR;
-       SLAPDServiceStatus.dwServiceSpecificExitCode    = 0;
-       SLAPDServiceStatus.dwCheckPoint                                 = 1;
-       SLAPDServiceStatus.dwWaitHint                                   = SCM_NOTIFICATION_INTERVAL * 2;
-
-       SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
-
-       // start up a thread to keep sending SERVICE_START_PENDING to the Service Control Manager
-       // until the slapd listener is completed and listening. Only then should we send 
-       // SERVICE_RUNNING to the Service Control Manager.
+       lutil_ServiceStatus.dwServiceType                               = SERVICE_WIN32_OWN_PROCESS;
+       lutil_ServiceStatus.dwCurrentState                              = SERVICE_START_PENDING;
+       lutil_ServiceStatus.dwControlsAccepted                  = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
+       lutil_ServiceStatus.dwWin32ExitCode                             = NO_ERROR;
+       lutil_ServiceStatus.dwServiceSpecificExitCode   = 0;
+       lutil_ServiceStatus.dwCheckPoint                                        = 1;
+       lutil_ServiceStatus.dwWaitHint                                  = SCM_NOTIFICATION_INTERVAL * 2;
+
+       SetServiceStatus(hlutil_ServiceStatus, &lutil_ServiceStatus);
+
+       /* start up a thread to keep sending SERVICE_START_PENDING to the Service Control Manager
+        * until the slapd listener is completed and listening. Only then should we send 
+        * SERVICE_RUNNING to the Service Control Manager. */
        ldap_pvt_thread_cond_init( &started_event );
        if ( started_event == NULL)
        {
-               // failed to create the event to determine when the startup process is complete so
-               // tell the Service Control Manager to wait another 30 seconds before deploying its
-               // assasin
-               SLAPDServiceStatus.dwCheckPoint++;
-               SLAPDServiceStatus.dwWaitHint = THIRTY_SECONDS;
-               SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
+               /* failed to create the event to determine when the startup process is complete so
+                * tell the Service Control Manager to wait another 30 seconds before deploying its
+                * assasin  */
+               lutil_ServiceStatus.dwCheckPoint++;
+               lutil_ServiceStatus.dwWaitHint = THIRTY_SECONDS;
+               SetServiceStatus(hlutil_ServiceStatus, &lutil_ServiceStatus);
        }
        else
        {
-               // start a thread to report the progress to the service control manager 
-               // until the started_event is fired.
+               /* start a thread to report the progress to the service control manager 
+                * until the started_event is fired.  */
                if ( ldap_pvt_thread_create( &start_status_tid, 0, start_status_routine, NULL ) == 0 )
                {
                        
                }
                else {
-                       // failed to create the thread that tells the Service Control Manager that the
-                       // service startup is proceeding. 
-                       // tell the Service Control Manager to wait another 30 seconds before deploying its
-                       // assasin.
-                       SLAPDServiceStatus.dwCheckPoint++;
-                       SLAPDServiceStatus.dwWaitHint = THIRTY_SECONDS;
-                       SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
+                       /* failed to create the thread that tells the Service Control Manager that the
+                        * service startup is proceeding. 
+                        * tell the Service Control Manager to wait another 30 seconds before deploying its
+                        * assasin.  */
+                       lutil_ServiceStatus.dwCheckPoint++;
+                       lutil_ServiceStatus.dwWaitHint = THIRTY_SECONDS;
+                       SetServiceStatus(hlutil_ServiceStatus, &lutil_ServiceStatus);
                }
        }
 }
 
-void ReportSlapdShutdownComplete(  )
+void lutil_ReportShutdownComplete(  )
 {
        if ( is_NT_Service )
        {
-               // stop sending SERVICE_STOP_PENDING messages to the Service Control Manager
+               /* stop sending SERVICE_STOP_PENDING messages to the Service Control Manager */
                ldap_pvt_thread_cond_signal( &stopped_event );
                ldap_pvt_thread_cond_destroy( &stopped_event );
 
-               // wait for the thread sending the SERVICE_STOP_PENDING messages to the Service Control Manager to die.
-               // if the wait fails then put ourselves to sleep for half the Service Control Manager update interval
+               /* wait for the thread sending the SERVICE_STOP_PENDING messages to the Service Control Manager to die.
+                * if the wait fails then put ourselves to sleep for half the Service Control Manager update interval */
                if (ldap_pvt_thread_join( stop_status_tid, (void *) NULL ) == -1)
                        ldap_pvt_thread_sleep( SCM_NOTIFICATION_INTERVAL / 2 );
 
-               SLAPDServiceStatus.dwCurrentState = SERVICE_STOPPED;
-               SLAPDServiceStatus.dwCheckPoint++;
-               SLAPDServiceStatus.dwWaitHint = SCM_NOTIFICATION_INTERVAL;
-               SetServiceStatus(hSLAPDServiceStatus, &SLAPDServiceStatus);
+               lutil_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+               lutil_ServiceStatus.dwCheckPoint++;
+               lutil_ServiceStatus.dwWaitHint = SCM_NOTIFICATION_INTERVAL;
+               SetServiceStatus(hlutil_ServiceStatus, &lutil_ServiceStatus);
        }
 }
+
+static char *GetErrorString( int err )
+{
+       static char msgBuf[1024];
+
+       FormatMessage(
+               FORMAT_MESSAGE_FROM_SYSTEM,
+               NULL,
+               err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+               msgBuf, 1024, NULL );
+
+       return msgBuf;
+}
+
+static char *GetLastErrorString( void )
+{
+       return GetErrorString( GetLastError() );
+}
+#endif