X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=service.cpp;h=52937cffb399d19f82dd436b5ec117bf91c85130;hb=b5286398f850b432edbddc6d602ab3f33ab086be;hp=fe6726216bc3513c39301233e7db04060b5decd8;hpb=28ff40d0bbd3b9ee7b0b5f3235d7972cfa884f2e;p=nssm.git

diff --git a/service.cpp b/service.cpp
index fe67262..52937cf 100644
--- a/service.cpp
+++ b/service.cpp
@@ -253,8 +253,8 @@ static unsigned long WINAPI shutdown_service(void *arg) {
 }
 
 /* Connect to the service manager */
-SC_HANDLE open_service_manager() {
-  SC_HANDLE ret = OpenSCManager(0, SERVICES_ACTIVE_DATABASE, SC_MANAGER_ALL_ACCESS);
+SC_HANDLE open_service_manager(unsigned long access) {
+  SC_HANDLE ret = OpenSCManager(0, SERVICES_ACTIVE_DATABASE, access);
   if (! ret) {
     if (is_admin) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENSCMANAGER_FAILED, 0);
     return 0;
@@ -264,14 +264,15 @@ SC_HANDLE open_service_manager() {
 }
 
 /* Open a service by name or display name. */
-SC_HANDLE open_service(SC_HANDLE services, TCHAR *service_name, TCHAR *canonical_name, unsigned long canonical_namelen) {
-  SC_HANDLE service_handle = OpenService(services, service_name, SERVICE_ALL_ACCESS);
+SC_HANDLE open_service(SC_HANDLE services, TCHAR *service_name, unsigned long access, TCHAR *canonical_name, unsigned long canonical_namelen) {
+  SC_HANDLE service_handle = OpenService(services, service_name, access);
   if (service_handle) {
     if (canonical_name && canonical_name != service_name) {
-      if (_sntprintf_s(canonical_name, canonical_namelen, _TRUNCATE, _T("%s"), service_name) < 0) {
-        print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("canonical_name"), _T("open_service()"));
-        return 0;
-      }
+      TCHAR displayname[SERVICE_NAME_LENGTH];
+      unsigned long displayname_len = (unsigned long) _countof(displayname);
+      GetServiceDisplayName(services, service_name, displayname, &displayname_len);
+      unsigned long keyname_len = canonical_namelen;
+      GetServiceKeyName(services, displayname, canonical_name, &keyname_len);
     }
     return service_handle;
   }
@@ -331,7 +332,7 @@ SC_HANDLE open_service(SC_HANDLE services, TCHAR *service_name, TCHAR *canonical
         }
 
         HeapFree(GetProcessHeap(), 0, status);
-        return open_service(services, canonical_name, 0, 0);
+        return open_service(services, canonical_name, access, 0, 0);
       }
     }
 
@@ -339,7 +340,7 @@ SC_HANDLE open_service(SC_HANDLE services, TCHAR *service_name, TCHAR *canonical
   }
 
   /* Recurse so we can get an error message. */
-  return open_service(services, service_name, 0, 0);
+  return open_service(services, service_name, access, 0, 0);
 }
 
 QUERY_SERVICE_CONFIG *query_service_config(const TCHAR *service_name, SC_HANDLE service_handle) {
@@ -370,6 +371,185 @@ QUERY_SERVICE_CONFIG *query_service_config(const TCHAR *service_name, SC_HANDLE
   return qsc;
 }
 
+int set_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle, TCHAR *buffer) {
+  TCHAR *dependencies = _T("");
+  unsigned long num_dependencies = 0;
+
+  if (buffer && buffer[0]) {
+    SC_HANDLE services = open_service_manager(SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE);
+    if (! services) {
+      print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
+      return 1;
+    }
+
+    /*
+      Count the dependencies then allocate a buffer big enough for their
+      canonical names, ie n * SERVICE_NAME_LENGTH.
+    */
+    TCHAR *s;
+    TCHAR *groups = 0;
+    for (s = buffer; *s; s++) {
+      num_dependencies++;
+      if (*s == SC_GROUP_IDENTIFIER) groups = s;
+      while (*s) s++;
+    }
+
+    /* At least one dependency is a group so we need to verify them. */
+    if (groups) {
+      HKEY key;
+      if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, NSSM_REGISTRY_GROUPS, 0, KEY_READ, &key)) {
+        _ftprintf(stderr, _T("%s: %s\n"), NSSM_REGISTRY_GROUPS, error_string(GetLastError()));
+        return 2;
+      }
+
+      unsigned long type;
+      unsigned long groupslen;
+      unsigned long ret = RegQueryValueEx(key, NSSM_REG_GROUPS, 0, &type, NULL, &groupslen);
+      if (ret == ERROR_SUCCESS) {
+        groups = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, groupslen);
+        if (! groups) {
+          print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("groups"), _T("set_service_dependencies()"));
+          return 3;
+        }
+
+        ret = RegQueryValueEx(key, NSSM_REG_GROUPS, 0, &type, (unsigned char *) groups, &groupslen);
+        if (ret != ERROR_SUCCESS) {
+          _ftprintf(stderr, _T("%s\\%s: %s"), NSSM_REGISTRY_GROUPS, NSSM_REG_GROUPS, error_string(GetLastError()));
+          HeapFree(GetProcessHeap(), 0, groups);
+          RegCloseKey(key);
+          return 4;
+        }
+      }
+      else if (ret != ERROR_FILE_NOT_FOUND) {
+        _ftprintf(stderr, _T("%s\\%s: %s"), NSSM_REGISTRY_GROUPS, NSSM_REG_GROUPS, error_string(GetLastError()));
+        RegCloseKey(key);
+        return 4;
+      }
+
+      RegCloseKey(key);
+
+    }
+
+    unsigned long dependencieslen = (num_dependencies * SERVICE_NAME_LENGTH) + 2;
+    dependencies = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dependencieslen * sizeof(TCHAR));
+    size_t i = 0;
+
+    TCHAR dependency[SERVICE_NAME_LENGTH];
+    for (s = buffer; *s; s++) {
+      /* Group? */
+      if (*s == SC_GROUP_IDENTIFIER) {
+        TCHAR *group = s + 1;
+
+        bool ok = false;
+        if (*group) {
+          for (TCHAR *g = groups; *g; g++) {
+            if (str_equiv(g, group)) {
+              ok = true;
+              /* Set canonical name. */
+              memmove(group, g, _tcslen(g) * sizeof(TCHAR));
+              break;
+            }
+
+            while (*g) g++;
+          }
+        }
+
+        if (ok) _sntprintf_s(dependency, _countof(dependency), _TRUNCATE, _T("%s"), s);
+        else {
+          HeapFree(GetProcessHeap(), 0, dependencies);
+          if (groups) HeapFree(GetProcessHeap(), 0, groups);
+          _ftprintf(stderr, _T("%s: %s"), s, error_string(ERROR_SERVICE_DEPENDENCY_DELETED));
+          return 5;
+        }
+      }
+      else {
+        SC_HANDLE dependency_handle = open_service(services, s, SERVICE_QUERY_STATUS, dependency, _countof(dependency));
+        if (! dependency_handle) {
+          HeapFree(GetProcessHeap(), 0, dependencies);
+          if (groups) HeapFree(GetProcessHeap(), 0, groups);
+          CloseServiceHandle(services);
+          _ftprintf(stderr, _T("%s: %s"), s, error_string(ERROR_SERVICE_DEPENDENCY_DELETED));
+          return 5;
+        }
+      }
+
+      size_t len = _tcslen(dependency) + 1;
+      memmove(dependencies + i, dependency, len * sizeof(TCHAR));
+      i += len;
+
+      while (*s) s++;
+    }
+
+    if (groups) HeapFree(GetProcessHeap(), 0, groups);
+    CloseServiceHandle(services);
+  }
+
+  if (! ChangeServiceConfig(service_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, 0, 0, 0, dependencies, 0, 0, 0)) {
+    if (num_dependencies) HeapFree(GetProcessHeap(), 0, dependencies);
+    print_message(stderr, NSSM_MESSAGE_CHANGESERVICECONFIG_FAILED, error_string(GetLastError()));
+    return -1;
+  }
+
+  if (num_dependencies) HeapFree(GetProcessHeap(), 0, dependencies);
+  return 0;
+}
+
+int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle, TCHAR **buffer, unsigned long *bufsize, int type) {
+  if (! buffer) return 1;
+  if (! bufsize) return 2;
+
+  *buffer = 0;
+  *bufsize = 0;
+
+  QUERY_SERVICE_CONFIG *qsc = query_service_config(service_name, service_handle);
+  if (! qsc) return 3;
+
+  if (! qsc->lpDependencies) return 0;
+  if (! qsc->lpDependencies[0]) return 0;
+
+  /* lpDependencies is doubly NULL terminated. */
+  while (qsc->lpDependencies[*bufsize]) {
+    while (qsc->lpDependencies[*bufsize]) ++*bufsize;
+    ++*bufsize;
+  }
+
+  *bufsize += 2;
+
+  *buffer = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *bufsize * sizeof(TCHAR));
+  if (! *buffer) {
+    *bufsize = 0;
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("lpDependencies"), _T("get_service_dependencies()"));
+    return 4;
+  }
+
+  if (type == DEPENDENCY_ALL) memmove(*buffer, qsc->lpDependencies, *bufsize * sizeof(TCHAR));
+  else {
+    TCHAR *s;
+    size_t i = 0;
+    *bufsize = 0;
+    for (s = qsc->lpDependencies; *s; s++) {
+      /* Only copy the appropriate type of dependency. */
+      if ((*s == SC_GROUP_IDENTIFIER && type & DEPENDENCY_GROUPS) || (*s != SC_GROUP_IDENTIFIER && type & DEPENDENCY_SERVICES)) {
+        size_t len = _tcslen(s) + 1;
+        *bufsize += (unsigned long) len;
+        memmove(*buffer + i, s, len * sizeof(TCHAR));
+        i += len;
+      }
+
+      while (*s) s++;
+    }
+    ++*bufsize;
+  }
+
+  HeapFree(GetProcessHeap(), 0, qsc);
+
+  return 0;
+}
+
+int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle, TCHAR **buffer, unsigned long *bufsize) {
+  return get_service_dependencies(service_name, service_handle, buffer, bufsize, DEPENDENCY_ALL);
+}
+
 int set_service_description(const TCHAR *service_name, SC_HANDLE service_handle, TCHAR *buffer) {
   SERVICE_DESCRIPTION description;
   ZeroMemory(&description, sizeof(description));
@@ -509,6 +689,7 @@ void set_nssm_service_defaults(nssm_service_t *service) {
   service->kill_console_delay = NSSM_KILL_CONSOLE_GRACE_PERIOD;
   service->kill_window_delay = NSSM_KILL_WINDOW_GRACE_PERIOD;
   service->kill_threads_delay = NSSM_KILL_THREADS_GRACE_PERIOD;
+  service->kill_process_tree = 1;
 }
 
 /* Allocate and zero memory for a service. */
@@ -526,11 +707,12 @@ void cleanup_nssm_service(nssm_service_t *service) {
     SecureZeroMemory(service->password, service->passwordlen);
     HeapFree(GetProcessHeap(), 0, service->password);
   }
+  if (service->dependencies) HeapFree(GetProcessHeap(), 0, service->dependencies);
   if (service->env) HeapFree(GetProcessHeap(), 0, service->env);
   if (service->env_extra) HeapFree(GetProcessHeap(), 0, service->env_extra);
   if (service->handle) CloseServiceHandle(service->handle);
   if (service->process_handle) CloseHandle(service->process_handle);
-  if (service->wait_handle) UnregisterWait(service->process_handle);
+  if (service->wait_handle) UnregisterWait(service->wait_handle);
   if (service->throttle_section_initialised) DeleteCriticalSection(&service->throttle_section);
   if (service->throttle_timer) CloseHandle(service->throttle_timer);
   if (service->initial_env) FreeEnvironmentStrings(service->initial_env);
@@ -657,14 +839,16 @@ int pre_edit_service(int argc, TCHAR **argv) {
   _sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), service_name);
 
   /* Open service manager */
-  SC_HANDLE services = open_service_manager();
+  SC_HANDLE services = open_service_manager(SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE);
   if (! services) {
     print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
     return 2;
   }
 
   /* Try to open the service */
-  service->handle = open_service(services, service->name, service->name, _countof(service->name));
+  unsigned long access = SERVICE_QUERY_CONFIG;
+  if (mode != MODE_GETTING) access |= SERVICE_CHANGE_CONFIG;
+  service->handle = open_service(services, service->name, access, service->name, _countof(service->name));
   if (! service->handle) {
     CloseServiceHandle(services);
     return 3;
@@ -673,7 +857,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   /* Get system details. */
   QUERY_SERVICE_CONFIG *qsc = query_service_config(service->name, service->handle);
   if (! qsc) {
-    CloseHandle(service->handle);
+    CloseServiceHandle(service->handle);
     CloseServiceHandle(services);
     return 4;
   }
@@ -682,7 +866,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   if (! (service->type & SERVICE_WIN32_OWN_PROCESS)) {
     if (mode != MODE_GETTING) {
       HeapFree(GetProcessHeap(), 0, qsc);
-      CloseHandle(service->handle);
+      CloseServiceHandle(service->handle);
       CloseServiceHandle(services);
       print_message(stderr, NSSM_MESSAGE_CANNOT_EDIT, service->name, NSSM_WIN32_OWN_PROCESS, 0);
       return 3;
@@ -692,7 +876,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   if (get_service_startup(service->name, service->handle, qsc, &service->startup)) {
     if (mode != MODE_GETTING) {
       HeapFree(GetProcessHeap(), 0, qsc);
-      CloseHandle(service->handle);
+      CloseServiceHandle(service->handle);
       CloseServiceHandle(services);
       return 4;
     }
@@ -701,7 +885,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   if (get_service_username(service->name, qsc, &service->username, &service->usernamelen)) {
     if (mode != MODE_GETTING) {
       HeapFree(GetProcessHeap(), 0, qsc);
-      CloseHandle(service->handle);
+      CloseServiceHandle(service->handle);
       CloseServiceHandle(services);
       return 5;
     }
@@ -720,12 +904,20 @@ int pre_edit_service(int argc, TCHAR **argv) {
   /* Get extended system details. */
   if (get_service_description(service->name, service->handle, _countof(service->description), service->description)) {
     if (mode != MODE_GETTING) {
-      CloseHandle(service->handle);
+      CloseServiceHandle(service->handle);
       CloseServiceHandle(services);
       return 6;
     }
   }
 
+  if (get_service_dependencies(service->name, service->handle, &service->dependencies, &service->dependencieslen)) {
+    if (mode != MODE_GETTING) {
+      CloseServiceHandle(service->handle);
+      CloseServiceHandle(services);
+      return 7;
+    }
+  }
+
   /* Get NSSM details. */
   get_parameters(service, 0);
 
@@ -744,7 +936,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
 
   /* Trying to manage App* parameters for a non-NSSM service. */
   if (! setting->native && service->native) {
-    CloseHandle(service->handle);
+    CloseServiceHandle(service->handle);
     print_message(stderr, NSSM_MESSAGE_NATIVE_PARAMETER, setting->name, NSSM);
     return 1;
   }
@@ -762,7 +954,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
     if (setting->native) ret = get_setting(service->name, service->handle, setting, &value, additional);
     else ret = get_setting(service->name, key, setting, &value, additional);
     if (ret < 0) {
-      CloseHandle(service->handle);
+      CloseServiceHandle(service->handle);
       return 5;
     }
 
@@ -780,7 +972,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
     }
 
     if (! service->native) RegCloseKey(key);
-    CloseHandle(service->handle);
+    CloseServiceHandle(service->handle);
     return 0;
   }
 
@@ -802,7 +994,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
     value.string = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, len * sizeof(TCHAR));
     if (! value.string) {
       print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("value"), _T("edit_service()"));
-      CloseHandle(service->handle);
+      CloseServiceHandle(service->handle);
       return 2;
     }
 
@@ -835,12 +1027,12 @@ int pre_edit_service(int argc, TCHAR **argv) {
   if (value.string) HeapFree(GetProcessHeap(), 0, value.string);
   if (ret < 0) {
     if (! service->native) RegCloseKey(key);
-    CloseHandle(service->handle);
+    CloseServiceHandle(service->handle);
     return 6;
   }
 
   if (! service->native) RegCloseKey(key);
-  CloseHandle(service->handle);
+  CloseServiceHandle(service->handle);
 
   return 0;
 }
@@ -867,7 +1059,7 @@ int install_service(nssm_service_t *service) {
   if (! service) return 1;
 
   /* Open service manager */
-  SC_HANDLE services = open_service_manager();
+  SC_HANDLE services = open_service_manager(SC_MANAGER_CONNECT | SC_MANAGER_CREATE_SERVICE);
   if (! services) {
     print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
     cleanup_nssm_service(service);
@@ -928,26 +1120,37 @@ int edit_service(nssm_service_t *service, bool editing) {
     Empty passwords are valid but we won't allow them in the GUI.
   */
   TCHAR *username = 0;
+  TCHAR *canon = 0;
   TCHAR *password = 0;
   if (service->usernamelen) {
     username = service->username;
+    if (canonicalise_username(username, &canon)) return 5;
     if (service->passwordlen) password = service->password;
-    else password = _T("");
   }
-  else if (editing) username = NSSM_LOCALSYSTEM_ACCOUNT;
+  else if (editing) username = canon = NSSM_LOCALSYSTEM_ACCOUNT;
 
-  if (well_known_username(username)) password = _T("");
+  if (well_known_username(canon)) password = _T("");
   else {
-    if (grant_logon_as_service(username)) {
+    if (grant_logon_as_service(canon)) {
+      if (canon != username) HeapFree(GetProcessHeap(), 0, canon);
       print_message(stderr, NSSM_MESSAGE_GRANT_LOGON_AS_SERVICE_FAILED, username);
       return 5;
     }
   }
 
-  if (! ChangeServiceConfig(service->handle, service->type, startup, SERVICE_NO_CHANGE, 0, 0, 0, 0, username, password, service->displayname)) {
+  TCHAR *dependencies = _T("");
+  if (service->dependencieslen) dependencies = 0; /* Change later. */
+
+  if (! ChangeServiceConfig(service->handle, service->type, startup, SERVICE_NO_CHANGE, 0, 0, 0, dependencies, canon, password, service->displayname)) {
+    if (canon != username) HeapFree(GetProcessHeap(), 0, canon);
     print_message(stderr, NSSM_MESSAGE_CHANGESERVICECONFIG_FAILED, error_string(GetLastError()));
     return 5;
   }
+  if (canon != username) HeapFree(GetProcessHeap(), 0, canon);
+
+  if (service->dependencieslen) {
+    if (set_service_dependencies(service->name, service->handle, service->dependencies)) return 5;
+  }
 
   if (service->description[0] || editing) {
     set_service_description(service->name, service->handle, service->description);
@@ -986,13 +1189,33 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
   TCHAR *service_name = argv[0];
   TCHAR canonical_name[SERVICE_NAME_LENGTH];
 
-  SC_HANDLE services = open_service_manager();
+  SC_HANDLE services = open_service_manager(SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE);
   if (! services) {
     print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
     return 2;
   }
 
-  SC_HANDLE service_handle = open_service(services, service_name, canonical_name, _countof(canonical_name));
+  unsigned long access = SERVICE_QUERY_STATUS;
+  switch (control) {
+    case NSSM_SERVICE_CONTROL_START:
+      access |= SERVICE_START;
+    break;
+
+    case SERVICE_CONTROL_CONTINUE:
+    case SERVICE_CONTROL_PAUSE:
+      access |= SERVICE_PAUSE_CONTINUE;
+      break;
+
+    case SERVICE_CONTROL_STOP:
+      access |= SERVICE_STOP;
+      break;
+
+    case NSSM_SERVICE_CONTROL_ROTATE:
+      access |= SERVICE_USER_DEFINED_CONTROL;
+      break;
+  }
+
+  SC_HANDLE service_handle = open_service(services, service_name, access, canonical_name, _countof(canonical_name));
   if (! service_handle) {
     CloseServiceHandle(services);
     return 3;
@@ -1019,7 +1242,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
 
     if (ret) {
       int response = await_service_control_response(control, service_handle, &service_status, initial_status);
-      CloseHandle(service_handle);
+      CloseServiceHandle(service_handle);
 
       if (response) {
         print_message(stderr, NSSM_MESSAGE_BAD_CONTROL_RESPONSE, canonical_name, service_status_text(service_status.dwCurrentState), service_control_text(control));
@@ -1029,7 +1252,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
       return 0;
     }
     else {
-      CloseHandle(service_handle);
+      CloseServiceHandle(service_handle);
       _ftprintf(stderr, _T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));
       return 1;
     }
@@ -1065,7 +1288,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
 
     if (ret) {
       int response = await_service_control_response(control, service_handle, &service_status, initial_status);
-      CloseHandle(service_handle);
+      CloseServiceHandle(service_handle);
 
       if (response) {
         print_message(stderr, NSSM_MESSAGE_BAD_CONTROL_RESPONSE, canonical_name, service_status_text(service_status.dwCurrentState), service_control_text(control));
@@ -1075,7 +1298,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
       return 0;
     }
     else {
-      CloseHandle(service_handle);
+      CloseServiceHandle(service_handle);
       _ftprintf(stderr, _T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));
       if (error == ERROR_SERVICE_NOT_ACTIVE) {
         if (control == SERVICE_CONTROL_SHUTDOWN || control == SERVICE_CONTROL_STOP) return 0;
@@ -1090,14 +1313,14 @@ int remove_service(nssm_service_t *service) {
   if (! service) return 1;
 
   /* Open service manager */
-  SC_HANDLE services = open_service_manager();
+  SC_HANDLE services = open_service_manager(SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE);
   if (! services) {
     print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
     return 2;
   }
 
   /* Try to open the service */
-  service->handle = open_service(services, service->name, service->name, _countof(service->name));
+  service->handle = open_service(services, service->name, DELETE, service->name, _countof(service->name));
   if (! service->handle) {
     CloseServiceHandle(services);
     return 3;
@@ -1140,7 +1363,7 @@ void WINAPI service_main(unsigned long argc, TCHAR **argv) {
   /* Initialise status */
   ZeroMemory(&service->status, sizeof(service->status));
   service->status.dwServiceType = SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS;
-  service->status.dwControlsAccepted = SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_PAUSE_CONTINUE;
+  service->status.dwControlsAccepted = SERVICE_ACCEPT_POWEREVENT | SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_PAUSE_CONTINUE;
   service->status.dwWin32ExitCode = NO_ERROR;
   service->status.dwServiceSpecificExitCode = 0;
   service->status.dwCheckPoint = 0;
@@ -1167,9 +1390,9 @@ void WINAPI service_main(unsigned long argc, TCHAR **argv) {
     /* Try to create the exit action parameters; we don't care if it fails */
     create_exit_action(service->name, exit_action_strings[0], false);
 
-    SC_HANDLE services = open_service_manager();
+    SC_HANDLE services = open_service_manager(SC_MANAGER_CONNECT);
     if (services) {
-      service->handle = OpenService(services, service->name, SC_MANAGER_ALL_ACCESS);
+      service->handle = open_service(services, service->name, SERVICE_CHANGE_CONFIG, 0, 0);
       set_service_recovery(service);
       CloseServiceHandle(services);
     }
@@ -1238,6 +1461,7 @@ TCHAR *service_control_text(unsigned long control) {
     case SERVICE_CONTROL_CONTINUE: return _T("CONTINUE");
     case SERVICE_CONTROL_INTERROGATE: return _T("INTERROGATE");
     case NSSM_SERVICE_CONTROL_ROTATE: return _T("ROTATE");
+    case SERVICE_CONTROL_POWEREVENT: return _T("POWEREVENT");
     default: return 0;
   }
 }
@@ -1345,6 +1569,15 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
       if (service->rotate_stdout_online == NSSM_ROTATE_ONLINE) service->rotate_stdout_online = NSSM_ROTATE_ONLINE_ASAP;
       if (service->rotate_stderr_online == NSSM_ROTATE_ONLINE) service->rotate_stderr_online = NSSM_ROTATE_ONLINE_ASAP;
       return NO_ERROR;
+
+    case SERVICE_CONTROL_POWEREVENT:
+      if (event != PBT_APMRESUMEAUTOMATIC) {
+        log_service_control(service->name, control, false);
+        return NO_ERROR;
+      }
+      log_service_control(service->name, control, true);
+      end_service((void *) service, false);
+      return NO_ERROR;
   }
 
   /* Unknown control */
@@ -1405,7 +1638,7 @@ int start_service(nssm_service_t *service) {
     unsigned long error = GetLastError();
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service->name, service->exe, error_string(error), 0);
     close_output_handles(&si);
-    duplicate_environment(service->initial_env);
+    duplicate_environment_strings(service->initial_env);
     return stop_service(service, exitcode, true, true);
   }
   service->process_handle = pi.hProcess;
@@ -1418,7 +1651,7 @@ int start_service(nssm_service_t *service) {
   if (! service->no_console) FreeConsole();
 
   /* Restore our environment. */
-  duplicate_environment(service->initial_env);
+  duplicate_environment_strings(service->initial_env);
 
   if (service->affinity) {
     /*
@@ -1568,7 +1801,7 @@ void CALLBACK end_service(void *arg, unsigned char why) {
 
   /* Clean up. */
   if (exitcode == STILL_ACTIVE) exitcode = 0;
-  if (service->pid) kill_process_tree(service, service->pid, exitcode, service->pid);
+  if (service->pid && service->kill_process_tree) kill_process_tree(service, service->pid, exitcode, service->pid);
   service->pid = 0;
 
   /*