git://git.iain.cx/iain / nssm.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added append_to/remove_from_dependencies().
[nssm.git] / service.cpp
diff --git a/service.cpp b/service.cpp
index b3b0c62..a94e698 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -429,6 +429,56 @@ QUERY_SERVICE_CONFIG *query_service_config(const TCHAR *service_name, SC_HANDLE
   return qsc;\r
 }\r
 \r
+/* WILL NOT allocate a new string if the identifier is already present. */\r
+int prepend_service_group_identifier(TCHAR *group, TCHAR **canon) {\r
+  if (! group || ! group[0] || group[0] == SC_GROUP_IDENTIFIER) {\r
+    *canon = group;\r
+    return 0;\r
+  }\r
+\r
+  size_t len = _tcslen(group) + 1;\r
+  *canon = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(TCHAR));\r
+  if (! *canon) {\r
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("canon"), _T("prepend_service_group_identifier()"));\r
+    return 1;\r
+  }\r
+\r
+  TCHAR *s = *canon;\r
+  *s++ = SC_GROUP_IDENTIFIER;\r
+  memmove(s, group, len * sizeof(TCHAR));\r
+  (*canon)[len] = _T('\0');\r
+\r
+  return 0;\r
+}\r
+\r
+int append_to_dependencies(TCHAR *dependencies, unsigned long dependencieslen, TCHAR *string, TCHAR **newdependencies, unsigned long *newlen, int type) {\r
+  *newlen = 0;\r
+\r
+  TCHAR *canon = 0;\r
+  if (type == DEPENDENCY_GROUPS) {\r
+    if (prepend_service_group_identifier(string, &canon)) return 1;\r
+  }\r
+  else canon = string;\r
+  int ret = append_to_double_null(dependencies, dependencieslen, newdependencies, newlen, canon, 0, false);\r
+  if (canon && canon != string) HeapFree(GetProcessHeap(), 0, canon);\r
+\r
+  return ret;\r
+}\r
+\r
+int remove_from_dependencies(TCHAR *dependencies, unsigned long dependencieslen, TCHAR *string, TCHAR **newdependencies, unsigned long *newlen, int type) {\r
+  *newlen = 0;\r
+\r
+  TCHAR *canon = 0;\r
+  if (type == DEPENDENCY_GROUPS) {\r
+    if (prepend_service_group_identifier(string, &canon)) return 1;\r
+  }\r
+  else canon = string;\r
+  int ret = remove_from_double_null(dependencies, dependencieslen, newdependencies, newlen, canon, 0, false);\r
+  if (canon && canon != string) HeapFree(GetProcessHeap(), 0, canon);\r
+\r
+  return ret;\r
+}\r
+\r
 int set_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle, TCHAR *buffer) {\r
   TCHAR *dependencies = _T("");\r
   unsigned long num_dependencies = 0;\r
@@ -562,8 +612,10 @@ int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle
   QUERY_SERVICE_CONFIG *qsc = query_service_config(service_name, service_handle);\r
   if (! qsc) return 3;\r
 \r
-  if (! qsc->lpDependencies) return 0;\r
-  if (! qsc->lpDependencies[0]) return 0;\r
+  if (! qsc->lpDependencies || ! qsc->lpDependencies[0]) {\r
+    HeapFree(GetProcessHeap(), 0, qsc);\r
+    return 0;\r
+  }\r
 \r
   /* lpDependencies is doubly NULL terminated. */\r
   while (qsc->lpDependencies[*bufsize]) {\r
@@ -577,6 +629,7 @@ int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle
   if (! *buffer) {\r
     *bufsize = 0;\r
     print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("lpDependencies"), _T("get_service_dependencies()"));\r
+    HeapFree(GetProcessHeap(), 0, qsc);\r
     return 4;\r
   }\r
 \r
@@ -601,6 +654,12 @@ int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle
 \r
   HeapFree(GetProcessHeap(), 0, qsc);\r
 \r
+  if (! *buffer[0]) {\r
+    HeapFree(GetProcessHeap(), 0, *buffer);\r
+    *buffer = 0;\r
+    *bufsize = 0;\r
+  }\r
+\r
   return 0;\r
 }\r
 \r
@@ -653,8 +712,6 @@ int get_service_description(const TCHAR *service_name, SC_HANDLE service_handle,
     print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service_name, _T("SERVICE_CONFIG_DESCRIPTION"), error_string(error));\r
     return 4;\r
   }\r
-\r
-  return 0;\r
 }\r
 \r
 int get_service_startup(const TCHAR *service_name, SC_HANDLE service_handle, const QUERY_SERVICE_CONFIG *qsc, unsigned long *startup) {\r
@@ -762,7 +819,7 @@ void cleanup_nssm_service(nssm_service_t *service) {
   if (! service) return;\r
   if (service->username) HeapFree(GetProcessHeap(), 0, service->username);\r
   if (service->password) {\r
-    SecureZeroMemory(service->password, service->passwordlen);\r
+    SecureZeroMemory(service->password, service->passwordlen * sizeof(TCHAR));\r
     HeapFree(GetProcessHeap(), 0, service->password);\r
   }\r
   if (service->dependencies) HeapFree(GetProcessHeap(), 0, service->dependencies);\r
@@ -1074,7 +1131,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   }\r
 \r
   if (! service->native) {\r
-    key = open_registry(service->name, KEY_WRITE);\r
+    key = open_registry(service->name, KEY_READ | KEY_WRITE);\r
     if (! key) {\r
       if (value.string) HeapFree(GetProcessHeap(), 0, value.string);\r
       return 4;\r
@@ -1723,15 +1780,7 @@ int start_service(nssm_service_t *service) {
   service->status.dwControlsAccepted = SERVICE_ACCEPT_POWEREVENT | SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_STOP;\r
   SetServiceStatus(service->status_handle, &service->status);\r
 \r
-  /* Pre-start hook. */\r
   unsigned long control = NSSM_SERVICE_CONTROL_START;\r
-  if (nssm_hook(&hook_threads, service, NSSM_HOOK_EVENT_START, NSSM_HOOK_ACTION_PRE, &control, NSSM_SERVICE_STATUS_DEADLINE, false) == NSSM_HOOK_STATUS_ABORT) {\r
-    TCHAR code[16];\r
-    _sntprintf_s(code, _countof(code), _TRUNCATE, _T("%lu"), NSSM_HOOK_STATUS_ABORT);\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_PRESTART_HOOK_ABORT, NSSM_HOOK_EVENT_START, NSSM_HOOK_ACTION_PRE, service->name, code, 0);\r
-    unset_service_environment(service);\r
-    return stop_service(service, 5, true, true);\r
-  }\r
 \r
   /* Did another thread receive a stop control? */\r
   if (service->allow_restart) {\r
@@ -1744,6 +1793,15 @@ int start_service(nssm_service_t *service) {
       return stop_service(service, 4, true, true);\r
     }\r
 \r
+    /* Pre-start hook. May need I/O to have been redirected already. */\r
+    if (nssm_hook(&hook_threads, service, NSSM_HOOK_EVENT_START, NSSM_HOOK_ACTION_PRE, &control, NSSM_SERVICE_STATUS_DEADLINE, false) == NSSM_HOOK_STATUS_ABORT) {\r
+      TCHAR code[16];\r
+      _sntprintf_s(code, _countof(code), _TRUNCATE, _T("%lu"), NSSM_HOOK_STATUS_ABORT);\r
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_PRESTART_HOOK_ABORT, NSSM_HOOK_EVENT_START, NSSM_HOOK_ACTION_PRE, service->name, code, 0);\r
+      unset_service_environment(service);\r
+      return stop_service(service, 5, true, true);\r
+    }\r
+\r
     /* The pre-start hook will have cleaned the environment. */\r
     set_service_environment(service);\r
 \r
@@ -1982,7 +2040,6 @@ void CALLBACK end_service(void *arg, unsigned char why) {
       wait_for_hooks(service, false);\r
       free_imports();\r
       exit(exitcode);\r
-    break;\r
   }\r
 }\r
 \r
The Non-Sucking Service Manager