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

diff --git a/service.cpp b/service.cpp
index b8c73ef..52937cf 100644
--- a/service.cpp
+++ b/service.cpp
@@ -1,8 +1,5 @@
 #include "nssm.h"
 
-/* This is explicitly a wide string. */
-#define NSSM_LOGON_AS_SERVICE_RIGHT L"SeServiceLogonRight"
-
 bool is_admin;
 bool use_critical_section;
 
@@ -18,6 +15,85 @@ typedef struct {
   int last;
 } list_t;
 
+/*
+  Check the status in response to a control.
+  Returns:  1 if the status is expected, eg STOP following CONTROL_STOP.
+            0 if the status is desired, eg STOPPED following CONTROL_STOP.
+           -1 if the status is undesired, eg STOPPED following CONTROL_START.
+*/
+static inline int service_control_response(unsigned long control, unsigned long status) {
+  switch (control) {
+    case NSSM_SERVICE_CONTROL_START:
+      switch (status) {
+        case SERVICE_START_PENDING:
+          return 1;
+
+        case SERVICE_RUNNING:
+          return 0;
+
+        default:
+          return -1;
+      }
+
+    case SERVICE_CONTROL_STOP:
+    case SERVICE_CONTROL_SHUTDOWN:
+      switch (status) {
+        case SERVICE_STOP_PENDING:
+          return 1;
+
+        case SERVICE_STOPPED:
+          return 0;
+
+        default:
+          return -1;
+      }
+
+    case SERVICE_CONTROL_PAUSE:
+      switch (status) {
+        case SERVICE_PAUSE_PENDING:
+          return 1;
+
+        case SERVICE_PAUSED:
+          return 0;
+
+        default:
+          return -1;
+      }
+
+    case SERVICE_CONTROL_CONTINUE:
+      switch (status) {
+        case SERVICE_CONTINUE_PENDING:
+          return 1;
+
+        case SERVICE_RUNNING:
+          return 0;
+
+        default:
+          return -1;
+      }
+
+    case SERVICE_CONTROL_INTERROGATE:
+      return 0;
+  }
+
+  return 0;
+}
+
+static inline int await_service_control_response(unsigned long control, SC_HANDLE service_handle, SERVICE_STATUS *service_status, unsigned long initial_status) {
+  int tries = 0;
+  while (QueryServiceStatus(service_handle, service_status)) {
+    int response = service_control_response(control, service_status->dwCurrentState);
+    /* Alas we can't WaitForSingleObject() on an SC_HANDLE. */
+    if (! response) return response;
+    if (response > 0 || service_status->dwCurrentState == initial_status) {
+      if (++tries > 10) return response;
+      Sleep(50 * tries);
+    }
+    else return response;
+  }
+  return -1;
+}
+
 int affinity_mask_to_string(__int64 mask, TCHAR **string) {
   if (! string) return 1;
   if (! mask) {
@@ -177,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;
@@ -188,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;
   }
@@ -255,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);
       }
     }
 
@@ -263,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) {
@@ -294,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));
@@ -396,165 +652,20 @@ int get_service_username(const TCHAR *service_name, const QUERY_SERVICE_CONFIG *
 
   if (! qsc) return 1;
 
-  if (str_equiv(qsc->lpServiceStartName, NSSM_LOCALSYSTEM_ACCOUNT)) return 0;
-
-  size_t len = _tcslen(qsc->lpServiceStartName);
-  *username = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(TCHAR));
-  if (! *username) {
-    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("username"), _T("get_service_username()"));
-    return 2;
-  }
-
-  memmove(*username, qsc->lpServiceStartName, (len + 1) * sizeof(TCHAR));
-  *usernamelen = len;
-
-  return 0;
-}
-
-int grant_logon_as_service(const TCHAR *username) {
-  if (! username) return 0;
-  if (str_equiv(username, NSSM_LOCALSYSTEM_ACCOUNT)) return 0;
-
-  /* Open Policy object. */
-  LSA_OBJECT_ATTRIBUTES attributes;
-  ZeroMemory(&attributes, sizeof(attributes));
-
-  LSA_HANDLE policy;
-
-  NTSTATUS status = LsaOpenPolicy(0, &attributes, POLICY_ALL_ACCESS, &policy);
-  if (status) {
-    print_message(stderr, NSSM_MESSAGE_LSAOPENPOLICY_FAILED, error_string(LsaNtStatusToWinError(status)));
-    return 1;
-  }
-
-  /* Look up SID for the account. */
-  LSA_UNICODE_STRING lsa_username;
-#ifdef UNICODE
-  lsa_username.Buffer = (wchar_t *) username;
-  lsa_username.Length = (unsigned short) _tcslen(username) * sizeof(TCHAR);
-  lsa_username.MaximumLength = lsa_username.Length + sizeof(TCHAR);
-#else
-  size_t buflen;
-  mbstowcs_s(&buflen, NULL, 0, username, _TRUNCATE);
-  lsa_username.MaximumLength = (unsigned short) buflen * sizeof(wchar_t);
-  lsa_username.Length = lsa_username.MaximumLength - sizeof(wchar_t);
-  lsa_username.Buffer = (wchar_t *) HeapAlloc(GetProcessHeap(), 0, lsa_username.MaximumLength);
-  if (lsa_username.Buffer) mbstowcs_s(&buflen, lsa_username.Buffer, lsa_username.MaximumLength, username, _TRUNCATE);
-  else {
-    LsaClose(policy);
-    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("LSA_UNICODE_STRING"), _T("grant_logon_as_service()"));
-    return 2;
-  }
-#endif
-
-  LSA_REFERENCED_DOMAIN_LIST *translated_domains;
-  LSA_TRANSLATED_SID *translated_sid;
-  status = LsaLookupNames(policy, 1, &lsa_username, &translated_domains, &translated_sid);
-#ifndef UNICODE
-  HeapFree(GetProcessHeap(), 0, lsa_username.Buffer);
-#endif
-  if (status) {
-    LsaFreeMemory(translated_domains);
-    LsaFreeMemory(translated_sid);
-    LsaClose(policy);
-    print_message(stderr, NSSM_MESSAGE_LSALOOKUPNAMES_FAILED, username, error_string(LsaNtStatusToWinError(status)));
-    return 3;
-  }
-
-  if (translated_sid->Use != SidTypeUser) {
-    LsaFreeMemory(translated_domains);
-    LsaFreeMemory(translated_sid);
-    LsaClose(policy);
-    print_message(stderr, NSSM_GUI_INVALID_USERNAME, username);
-    return 4;
-  }
-
-  LSA_TRUST_INFORMATION *trust = &translated_domains->Domains[translated_sid->DomainIndex];
-  if (! trust || ! IsValidSid(trust->Sid)) {
-    LsaFreeMemory(translated_domains);
-    LsaFreeMemory(translated_sid);
-    LsaClose(policy);
-    print_message(stderr, NSSM_GUI_INVALID_USERNAME, username);
-    return 4;
-  }
-
-  /* GetSidSubAuthority*() return pointers! */
-  unsigned char *n = GetSidSubAuthorityCount(trust->Sid);
+  if (qsc->lpServiceStartName[0]) {
+    if (is_localsystem(qsc->lpServiceStartName)) return 0;
 
-  /* Convert translated SID to SID. */
-  SID *sid = (SID *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, GetSidLengthRequired(*n + 1));
-  if (! sid) {
-    LsaFreeMemory(translated_domains);
-    LsaFreeMemory(translated_sid);
-    LsaClose(policy);
-    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("SID"), _T("grant_logon_as_service"));
-    return 4;
-  }
-
-  unsigned long error;
-  if (! InitializeSid(sid, GetSidIdentifierAuthority(trust->Sid), *n + 1)) {
-    error = GetLastError();
-    HeapFree(GetProcessHeap(), 0, sid);
-    LsaFreeMemory(translated_domains);
-    LsaFreeMemory(translated_sid);
-    LsaClose(policy);
-    print_message(stderr, NSSM_MESSAGE_INITIALIZESID_FAILED, username, error_string(error));
-    return 5;
-  }
-
-  for (unsigned char i = 0; i <= *n; i++) {
-    unsigned long *sub = GetSidSubAuthority(sid, i);
-    if (i < *n) *sub = *GetSidSubAuthority(trust->Sid, i);
-    else *sub = translated_sid->RelativeId;
-  }
-
-  LsaFreeMemory(translated_domains);
-  LsaFreeMemory(translated_sid);
-
-  /* Check if the SID has the "Log on as a service" right. */
-  LSA_UNICODE_STRING lsa_right;
-  lsa_right.Buffer = NSSM_LOGON_AS_SERVICE_RIGHT;
-  lsa_right.Length = (unsigned short) wcslen(lsa_right.Buffer) * sizeof(wchar_t);
-  lsa_right.MaximumLength = lsa_right.Length + sizeof(wchar_t);
-
-  LSA_UNICODE_STRING *rights;
-  unsigned long count = ~0;
-  status = LsaEnumerateAccountRights(policy, sid, &rights, &count);
-  if (status) {
-    /*
-      If the account has no rights set LsaEnumerateAccountRights() will return
-      STATUS_OBJECT_NAME_NOT_FOUND and set count to 0.
-    */
-    error = LsaNtStatusToWinError(status);
-    if (error != ERROR_FILE_NOT_FOUND) {
-      HeapFree(GetProcessHeap(), 0, sid);
-      LsaClose(policy);
-      print_message(stderr, NSSM_MESSAGE_LSAENUMERATEACCOUNTRIGHTS_FAILED, username, error_string(error));
-      return 4;
+    size_t len = _tcslen(qsc->lpServiceStartName);
+    *username = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(TCHAR));
+    if (! *username) {
+      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("username"), _T("get_service_username()"));
+      return 2;
     }
-  }
 
-  for (unsigned long i = 0; i < count; i++) {
-    if (rights[i].Length != lsa_right.Length) continue;
-    if (_wcsnicmp(rights[i].Buffer, lsa_right.Buffer, lsa_right.MaximumLength)) continue;
-    /* The SID has the right. */
-    HeapFree(GetProcessHeap(), 0, sid);
-    LsaFreeMemory(rights);
-    LsaClose(policy);
-    return 0;
-  }
-  LsaFreeMemory(rights);
-
-  /* Add the right. */
-  status = LsaAddAccountRights(policy, sid, &lsa_right, 1);
-  HeapFree(GetProcessHeap(), 0, sid);
-  LsaClose(policy);
-  if (status) {
-    print_message(stderr, NSSM_MESSAGE_LSAADDACCOUNTRIGHTS_FAILED, error_string(LsaNtStatusToWinError(status)));
-    return 5;
+    memmove(*username, qsc->lpServiceStartName, (len + 1) * sizeof(TCHAR));
+    *usernamelen = len;
   }
 
-  print_message(stdout, NSSM_MESSAGE_GRANTED_LOGON_AS_SERVICE, username);
   return 0;
 }
 
@@ -578,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. */
@@ -595,13 +707,15 @@ 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);
   HeapFree(GetProcessHeap(), 0, service);
 }
 
@@ -701,28 +815,40 @@ int pre_edit_service(int argc, TCHAR **argv) {
       for (i = 0; settings[i].name; i++) _ftprintf(stderr, _T("%s\n"), settings[i].name);
       return 1;
     }
-    if (argc < mandatory) return usage(1);
 
     additional = 0;
     if (additional_mandatory) {
+      if (argc < mandatory) {
+        print_message(stderr, NSSM_MESSAGE_MISSING_SUBPARAMETER, parameter);
+        return 1;
+      }
+      additional = argv[3];
+      remainder = 4;
+    }
+    else if (str_equiv(setting->name, NSSM_NATIVE_OBJECTNAME) && mode == MODE_SETTING) {
       additional = argv[3];
       remainder = 4;
     }
-    else additional = argv[remainder];
+    else {
+      additional = argv[remainder];
+      if (argc < mandatory) return usage(1);
+    }
   }
 
   nssm_service_t *service = alloc_nssm_service();
   _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;
@@ -731,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;
   }
@@ -740,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;
@@ -750,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;
     }
@@ -759,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;
     }
@@ -778,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);
 
@@ -802,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;
   }
@@ -820,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;
     }
 
@@ -838,7 +972,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
     }
 
     if (! service->native) RegCloseKey(key);
-    CloseHandle(service->handle);
+    CloseServiceHandle(service->handle);
     return 0;
   }
 
@@ -847,6 +981,9 @@ int pre_edit_service(int argc, TCHAR **argv) {
     /* Unset the parameter. */
     value.string = 0;
   }
+  else if (remainder == argc) {
+    value.string = 0;
+  }
   else {
     /* Set the parameter. */
     size_t len = 0;
@@ -857,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;
     }
 
@@ -890,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;
 }
@@ -922,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);
@@ -983,23 +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 (grant_logon_as_service(username)) {
-    print_message(stderr, NSSM_MESSAGE_GRANT_LOGON_AS_SERVICE_FAILED, username);
-    return 5;
+  if (well_known_username(canon)) password = _T("");
+  else {
+    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);
@@ -1038,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;
@@ -1053,33 +1224,36 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
   int ret;
   unsigned long error;
   SERVICE_STATUS service_status;
-  if (control == 0) {
+  if (control == NSSM_SERVICE_CONTROL_START) {
+    unsigned long initial_status = SERVICE_STOPPED;
     ret = StartService(service_handle, (unsigned long) argc, (const TCHAR **) argv);
     error = GetLastError();
-    CloseHandle(service_handle);
     CloseServiceHandle(services);
 
     if (error == ERROR_IO_PENDING) {
       /*
         Older versions of Windows return immediately with ERROR_IO_PENDING
         indicate that the operation is still in progress.  Newer versions
-        will return it if there really is a delay.  As far as we're
-        concerned the operation is a success.  We don't claim to offer a
-        fully-feature service control method; it's just a quick 'n' dirty
-        interface.
-
-        In the future we may identify and handle this situation properly.
+        will return it if there really is a delay.
       */
       ret = 1;
       error = ERROR_SUCCESS;
     }
 
     if (ret) {
-      _tprintf(_T("%s: %s"), canonical_name, error_string(error));
+      int response = await_service_control_response(control, service_handle, &service_status, initial_status);
+      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));
+        return 1;
+      }
+      else _tprintf(_T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));
       return 0;
     }
     else {
-      _ftprintf(stderr, _T("%s: %s"), canonical_name, error_string(error));
+      CloseServiceHandle(service_handle);
+      _ftprintf(stderr, _T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));
       return 1;
     }
   }
@@ -1093,16 +1267,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
     error = GetLastError();
 
     if (ret) {
-      switch (service_status.dwCurrentState) {
-        case SERVICE_STOPPED: _tprintf(_T("SERVICE_STOPPED\n")); break;
-        case SERVICE_START_PENDING: _tprintf(_T("SERVICE_START_PENDING\n")); break;
-        case SERVICE_STOP_PENDING: _tprintf(_T("SERVICE_STOP_PENDING\n")); break;
-        case SERVICE_RUNNING: _tprintf(_T("SERVICE_RUNNING\n")); break;
-        case SERVICE_CONTINUE_PENDING: _tprintf(_T("SERVICE_CONTINUE_PENDING\n")); break;
-        case SERVICE_PAUSE_PENDING: _tprintf(_T("SERVICE_PAUSE_PENDING\n")); break;
-        case SERVICE_PAUSED: _tprintf(_T("SERVICE_PAUSED\n")); break;
-        default: _tprintf(_T("?\n")); return 1;
-      }
+      _tprintf(_T("%s\n"), service_status_text(service_status.dwCurrentState));
       return 0;
     }
     else {
@@ -1112,8 +1277,8 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
   }
   else {
     ret = ControlService(service_handle, control, &service_status);
+    unsigned long initial_status = service_status.dwCurrentState;
     error = GetLastError();
-    CloseHandle(service_handle);
     CloseServiceHandle(services);
 
     if (error == ERROR_IO_PENDING) {
@@ -1122,11 +1287,22 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
     }
 
     if (ret) {
-      _tprintf(_T("%s: %s"), canonical_name, error_string(error));
+      int response = await_service_control_response(control, service_handle, &service_status, initial_status);
+      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));
+        return 1;
+      }
+      else _tprintf(_T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));
       return 0;
     }
     else {
-      _ftprintf(stderr, _T("%s: %s"), canonical_name, error_string(error));
+      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;
+      }
       return 1;
     }
   }
@@ -1137,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;
@@ -1187,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;
@@ -1214,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);
     }
@@ -1234,6 +1410,9 @@ void WINAPI service_main(unsigned long argc, TCHAR **argv) {
     }
   }
 
+  /* Remember our initial environment. */
+  service->initial_env = GetEnvironmentStrings();
+
   monitor_service(service);
 }
 
@@ -1275,13 +1454,27 @@ int monitor_service(nssm_service_t *service) {
 TCHAR *service_control_text(unsigned long control) {
   switch (control) {
     /* HACK: there is no SERVICE_CONTROL_START constant */
-    case 0: return _T("START");
+    case NSSM_SERVICE_CONTROL_START: return _T("START");
     case SERVICE_CONTROL_STOP: return _T("STOP");
     case SERVICE_CONTROL_SHUTDOWN: return _T("SHUTDOWN");
     case SERVICE_CONTROL_PAUSE: return _T("PAUSE");
     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;
+  }
+}
+
+TCHAR *service_status_text(unsigned long status) {
+  switch (status) {
+    case SERVICE_STOPPED: return _T("SERVICE_STOPPED");
+    case SERVICE_START_PENDING: return _T("SERVICE_START_PENDING");
+    case SERVICE_STOP_PENDING: return _T("SERVICE_STOP_PENDING");
+    case SERVICE_RUNNING: return _T("SERVICE_RUNNING");
+    case SERVICE_CONTINUE_PENDING: return _T("SERVICE_CONTINUE_PENDING");
+    case SERVICE_PAUSE_PENDING: return _T("SERVICE_PAUSE_PENDING");
+    case SERVICE_PAUSED: return _T("SERVICE_PAUSED");
     default: return 0;
   }
 }
@@ -1356,7 +1549,8 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
         ZeroMemory(&service->throttle_duetime, sizeof(service->throttle_duetime));
         SetWaitableTimer(service->throttle_timer, &service->throttle_duetime, 0, 0, 0, 0);
       }
-      service->status.dwCurrentState = SERVICE_CONTINUE_PENDING;
+      /* We can't continue if the application is running! */
+      if (! service->process_handle) service->status.dwCurrentState = SERVICE_CONTINUE_PENDING;
       service->status.dwWaitHint = throttle_milliseconds(service->throttle) + NSSM_WAITHINT_MARGIN;
       log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_RESET_THROTTLE, service->name, 0);
       SetServiceStatus(service->status_handle, &service->status);
@@ -1372,8 +1566,17 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
 
     case NSSM_SERVICE_CONTROL_ROTATE:
       log_service_control(service->name, control, true);
-      if (service->rotate_stdout_online) service->rotate_stdout_online = NSSM_ROTATE_ONLINE_ASAP;
-      if (service->rotate_stdout_online) service->rotate_stderr_online = NSSM_ROTATE_ONLINE_ASAP;
+      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;
   }
 
@@ -1409,28 +1612,33 @@ int start_service(nssm_service_t *service) {
   TCHAR cmd[CMD_LENGTH];
   if (_sntprintf_s(cmd, _countof(cmd), _TRUNCATE, _T("\"%s\" %s"), service->exe, service->flags) < 0) {
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("command line"), _T("start_service"), 0);
-    close_output_handles(&si);
     return stop_service(service, 2, true, true);
   }
 
   throttle_restart(service);
 
+  /* Set the environment. */
+  if (service->env) duplicate_environment(service->env);
+  if (service->env_extra) set_environment_block(service->env_extra);
+
+  /* Set up I/O redirection. */
+  if (get_output_handles(service, &si)) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_OUTPUT_HANDLES_FAILED, service->name, 0);
+    if (! service->no_console) FreeConsole();
+    close_output_handles(&si);
+    return stop_service(service, 4, true, true);
+  }
+
   bool inherit_handles = false;
   if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;
   unsigned long flags = service->priority & priority_mask();
   if (service->affinity) flags |= CREATE_SUSPENDED;
-#ifdef UNICODE
-  flags |= CREATE_UNICODE_ENVIRONMENT;
-#endif
-  if (! CreateProcess(0, cmd, 0, 0, inherit_handles, flags, service->env, service->dir, &si, &pi)) {
+  if (! CreateProcess(0, cmd, 0, 0, inherit_handles, flags, 0, service->dir, &si, &pi)) {
     unsigned long exitcode = 3;
     unsigned long error = GetLastError();
-    if (error == ERROR_INVALID_PARAMETER && service->env) {
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED_INVALID_ENVIRONMENT, service->name, service->exe, NSSM_REG_ENV, 0);
-      if (test_environment(service->env)) exitcode = 4;
-    }
-    else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service->name, service->exe, error_string(error), 0);
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service->name, service->exe, error_string(error), 0);
     close_output_handles(&si);
+    duplicate_environment_strings(service->initial_env);
     return stop_service(service, exitcode, true, true);
   }
   service->process_handle = pi.hProcess;
@@ -1438,7 +1646,12 @@ int start_service(nssm_service_t *service) {
 
   if (get_process_creation_time(service->process_handle, &service->creation_time)) ZeroMemory(&service->creation_time, sizeof(service->creation_time));
 
-  close_output_handles(&si, ! service->rotate_stdout_online, ! service->rotate_stderr_online);
+  close_output_handles(&si);
+
+  if (! service->no_console) FreeConsole();
+
+  /* Restore our environment. */
+  duplicate_environment_strings(service->initial_env);
 
   if (service->affinity) {
     /*
@@ -1511,6 +1724,8 @@ int stop_service(nssm_service_t *service, unsigned long exitcode, bool graceful,
     service->wait_handle = 0;
   }
 
+  service->rotate_stdout_online = service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;
+
   if (default_action && ! exitcode && ! graceful) {
     log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_GRACEFUL_SUICIDE, service->name, service->exe, exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_REALLY], 0);
     graceful = true;
@@ -1558,15 +1773,20 @@ void CALLBACK end_service(void *arg, unsigned char why) {
 
   service->stopping = true;
 
+  service->rotate_stdout_online = service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;
+
+  /* Use now as a dummy exit time. */
+  GetSystemTimeAsFileTime(&service->exit_time);
+
   /* Check exit code */
   unsigned long exitcode = 0;
   TCHAR code[16];
   if (service->process_handle) {
     GetExitCodeProcess(service->process_handle, &exitcode);
-    if (exitcode == STILL_ACTIVE || get_process_exit_time(service->process_handle, &service->exit_time)) GetSystemTimeAsFileTime(&service->exit_time);
+    /* Check real exit time. */
+    if (exitcode != STILL_ACTIVE) get_process_exit_time(service->process_handle, &service->exit_time);
     CloseHandle(service->process_handle);
   }
-  else GetSystemTimeAsFileTime(&service->exit_time);
 
   service->process_handle = 0;
 
@@ -1581,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;
 
   /*