X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=settings.cpp;h=0ed75eed1e812c279dae95b1793d3e5fb62b31be;hb=b5286398f850b432edbddc6d602ab3f33ab086be;hp=c9bb32dda8cb4fcb64a02557c97cfb339eca8112;hpb=97d5ee74502bad595227da76c8d230ec54f2cbb3;p=nssm.git

diff --git a/settings.cpp b/settings.cpp
index c9bb32d..0ed75ee 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -305,7 +305,7 @@ static int setting_set_environment(const TCHAR *service_name, void *param, const
   unsigned long envlen = (unsigned long) _tcslen(value->string) + 1;
   TCHAR *unformatted = 0;
   unsigned long newlen;
-  if (unformat_environment(value->string, envlen, &unformatted, &newlen)) return -1;
+  if (unformat_double_null(value->string, envlen, &unformatted, &newlen)) return -1;
 
   if (test_environment(unformatted)) {
     HeapFree(GetProcessHeap(), 0, unformatted);
@@ -329,12 +329,12 @@ static int setting_get_environment(const TCHAR *service_name, void *param, const
 
   TCHAR *env = 0;
   unsigned long envlen;
-  if (set_environment((TCHAR *) service_name, key, (TCHAR *) name, &env, &envlen)) return -1;
+  if (get_environment((TCHAR *) service_name, key, (TCHAR *) name, &env, &envlen)) return -1;
   if (! envlen) return 0;
 
   TCHAR *formatted;
   unsigned long newlen;
-  if (format_environment(env, envlen, &formatted, &newlen)) return -1;
+  if (format_double_null(env, envlen, &formatted, &newlen)) return -1;
 
   int ret;
   if (additional) {
@@ -416,6 +416,209 @@ static int setting_get_priority(const TCHAR *service_name, void *param, const TC
 }
 
 /* Functions to manage native service settings. */
+static int native_set_dependongroup(const TCHAR *service_name, void *param, const TCHAR *name, void *default_value, value_t *value, const TCHAR *additional) {
+  SC_HANDLE service_handle = (SC_HANDLE) param;
+  if (! service_handle) return -1;
+
+  /*
+    Get existing service dependencies because we must set both types together.
+  */
+  TCHAR *buffer;
+  unsigned long buflen;
+  if (get_service_dependencies(service_name, service_handle, &buffer, &buflen, DEPENDENCY_SERVICES)) return -1;
+
+  if (! value || ! value->string || ! value->string[0]) {
+    if (! ChangeServiceConfig(service_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, 0, 0, 0, buffer, 0, 0, 0)) {
+      print_message(stderr, NSSM_MESSAGE_CHANGESERVICECONFIG_FAILED, error_string(GetLastError()));
+      if (buffer) HeapFree(GetProcessHeap(), 0, buffer);
+      return -1;
+    }
+
+    if (buffer) HeapFree(GetProcessHeap(), 0, buffer);
+    return 0;
+  }
+
+  unsigned long len = (unsigned long) _tcslen(value->string) + 1;
+  TCHAR *unformatted = 0;
+  unsigned long newlen;
+  if (unformat_double_null(value->string, len, &unformatted, &newlen)) {
+    if (buffer) HeapFree(GetProcessHeap(), 0, buffer);
+    return -1;
+  }
+
+  /* Prepend group identifier. */
+  unsigned long missing = 0;
+  TCHAR *canon = unformatted;
+  size_t canonlen = 0;
+  TCHAR *s;
+  for (s = unformatted; *s; s++) {
+    if (*s != SC_GROUP_IDENTIFIER) missing++;
+    size_t len = _tcslen(s);
+    canonlen += len + 1;
+    s += len;
+  }
+
+  if (missing) {
+    /* Missing identifiers plus double NULL terminator. */
+    canonlen += missing + 1;
+    newlen = (unsigned long) canonlen;
+
+    canon = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, canonlen * sizeof(TCHAR));
+    if (! canon) {
+      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("canon"), _T("native_set_dependongroup"));
+      if (unformatted) HeapFree(GetProcessHeap(), 0, unformatted);
+      if (buffer) HeapFree(GetProcessHeap(), 0, buffer);
+      return -1;
+    }
+
+    size_t i = 0;
+    for (s = unformatted; *s; s++) {
+      if (*s != SC_GROUP_IDENTIFIER) canon[i++] = SC_GROUP_IDENTIFIER;
+      size_t len = _tcslen(s);
+      memmove(canon + i, s, (len + 1) * sizeof(TCHAR));
+      i += len + 1;
+      s += len;
+    }
+  }
+
+  TCHAR *dependencies;
+  if (buflen > 2) {
+    dependencies = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (newlen + buflen) * sizeof(TCHAR));
+    if (! dependencies) {
+      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("dependencies"), _T("native_set_dependongroup"));
+      if (canon != unformatted) HeapFree(GetProcessHeap(), 0, canon);
+      if (unformatted) HeapFree(GetProcessHeap(), 0, unformatted);
+      if (buffer) HeapFree(GetProcessHeap(), 0, buffer);
+      return -1;
+    }
+
+    memmove(dependencies, buffer, buflen * sizeof(TCHAR));
+    memmove(dependencies + buflen - 1, canon, newlen * sizeof(TCHAR));
+  }
+  else dependencies = canon;
+
+  int ret = 1;
+  if (set_service_dependencies(service_name, service_handle, dependencies)) ret = -1;
+  if (dependencies != unformatted) HeapFree(GetProcessHeap(), 0, dependencies);
+  if (canon != unformatted) HeapFree(GetProcessHeap(), 0, canon);
+  if (unformatted) HeapFree(GetProcessHeap(), 0, unformatted);
+  if (buffer) HeapFree(GetProcessHeap(), 0, buffer);
+
+  return ret;
+}
+
+static int native_get_dependongroup(const TCHAR *service_name, void *param, const TCHAR *name, void *default_value, value_t *value, const TCHAR *additional) {
+  SC_HANDLE service_handle = (SC_HANDLE) param;
+  if (! service_handle) return -1;
+
+  TCHAR *buffer;
+  unsigned long buflen;
+  if (get_service_dependencies(service_name, service_handle, &buffer, &buflen, DEPENDENCY_GROUPS)) return -1;
+
+  int ret;
+  if (buflen) {
+    TCHAR *formatted;
+    unsigned long newlen;
+    if (format_double_null(buffer, buflen, &formatted, &newlen)) {
+      HeapFree(GetProcessHeap(), 0, buffer);
+      return -1;
+    }
+
+    ret = value_from_string(name, value, formatted);
+    HeapFree(GetProcessHeap(), 0, formatted);
+    HeapFree(GetProcessHeap(), 0, buffer);
+  }
+  else {
+    value->string = 0;
+    ret = 0;
+  }
+
+  return ret;
+}
+
+static int native_set_dependonservice(const TCHAR *service_name, void *param, const TCHAR *name, void *default_value, value_t *value, const TCHAR *additional) {
+  SC_HANDLE service_handle = (SC_HANDLE) param;
+  if (! service_handle) return -1;
+
+  /*
+    Get existing group dependencies because we must set both types together.
+  */
+  TCHAR *buffer;
+  unsigned long buflen;
+  if (get_service_dependencies(service_name, service_handle, &buffer, &buflen, DEPENDENCY_GROUPS)) return -1;
+
+  if (! value || ! value->string || ! value->string[0]) {
+    if (! ChangeServiceConfig(service_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, 0, 0, 0, buffer, 0, 0, 0)) {
+      print_message(stderr, NSSM_MESSAGE_CHANGESERVICECONFIG_FAILED, error_string(GetLastError()));
+      if (buffer) HeapFree(GetProcessHeap(), 0, buffer);
+      return -1;
+    }
+
+    if (buffer) HeapFree(GetProcessHeap(), 0, buffer);
+    return 0;
+  }
+
+  unsigned long len = (unsigned long) _tcslen(value->string) + 1;
+  TCHAR *unformatted = 0;
+  unsigned long newlen;
+  if (unformat_double_null(value->string, len, &unformatted, &newlen)) {
+    if (buffer) HeapFree(GetProcessHeap(), 0, buffer);
+    return -1;
+  }
+
+  TCHAR *dependencies;
+  if (buflen > 2) {
+    dependencies = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (newlen + buflen) * sizeof(TCHAR));
+    if (! dependencies) {
+      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("dependencies"), _T("native_set_dependonservice"));
+      if (unformatted) HeapFree(GetProcessHeap(), 0, unformatted);
+      if (buffer) HeapFree(GetProcessHeap(), 0, buffer);
+      return -1;
+    }
+
+    memmove(dependencies, buffer, buflen * sizeof(TCHAR));
+    memmove(dependencies + buflen - 1, unformatted, newlen * sizeof(TCHAR));
+  }
+  else dependencies = unformatted;
+
+  int ret = 1;
+  if (set_service_dependencies(service_name, service_handle, dependencies)) ret = -1;
+  if (dependencies != unformatted) HeapFree(GetProcessHeap(), 0, dependencies);
+  if (unformatted) HeapFree(GetProcessHeap(), 0, unformatted);
+  if (buffer) HeapFree(GetProcessHeap(), 0, buffer);
+
+  return ret;
+}
+
+static int native_get_dependonservice(const TCHAR *service_name, void *param, const TCHAR *name, void *default_value, value_t *value, const TCHAR *additional) {
+  SC_HANDLE service_handle = (SC_HANDLE) param;
+  if (! service_handle) return -1;
+
+  TCHAR *buffer;
+  unsigned long buflen;
+  if (get_service_dependencies(service_name, service_handle, &buffer, &buflen, DEPENDENCY_SERVICES)) return -1;
+
+  int ret;
+  if (buflen) {
+    TCHAR *formatted;
+    unsigned long newlen;
+    if (format_double_null(buffer, buflen, &formatted, &newlen)) {
+      HeapFree(GetProcessHeap(), 0, buffer);
+      return -1;
+    }
+
+    ret = value_from_string(name, value, formatted);
+    HeapFree(GetProcessHeap(), 0, formatted);
+    HeapFree(GetProcessHeap(), 0, buffer);
+  }
+  else {
+    value->string = 0;
+    ret = 0;
+  }
+
+  return ret;
+}
+
 int native_set_description(const TCHAR *service_name, void *param, const TCHAR *name, void *default_value, value_t *value, const TCHAR *additional) {
   SC_HANDLE service_handle = (SC_HANDLE) param;
   if (! service_handle) return -1;
@@ -527,21 +730,28 @@ int native_set_objectname(const TCHAR *service_name, void *param, const TCHAR *n
     Logical syntax is: nssm set <service> ObjectName <username> <password>
     That means the username is actually passed in the additional parameter.
   */
-  bool localsystem = true;
+  bool localsystem = false;
   TCHAR *username = NSSM_LOCALSYSTEM_ACCOUNT;
   TCHAR *password = 0;
   if (additional) {
-    if (! str_equiv(additional, NSSM_LOCALSYSTEM_ACCOUNT)) {
-      localsystem = false;
-      username = (TCHAR *) additional;
-      if (value && value->string) password = value->string;
-      else {
-        /* We need a password if the account is not LOCALSYSTEM. */
-        print_message(stderr, NSSM_MESSAGE_MISSING_PASSWORD, name);
-        return -1;
-      }
-    }
+    username = (TCHAR *) additional;
+    if (value && value->string) password = value->string;
   }
+  else if (value && value->string) username = value->string;
+
+  const TCHAR *well_known = well_known_username(username);
+  size_t passwordsize = 0;
+  if (well_known) {
+    if (str_equiv(well_known, NSSM_LOCALSYSTEM_ACCOUNT)) localsystem = true;
+    username = (TCHAR *) well_known;
+    password = _T("");
+  }
+  else if (! password) {
+    /* We need a password if the account requires it. */
+    print_message(stderr, NSSM_MESSAGE_MISSING_PASSWORD, name);
+    return -1;
+  }
+  else passwordsize = _tcslen(password) * sizeof(TCHAR);
 
   /*
     ChangeServiceConfig() will fail to set the username if the service is set
@@ -551,7 +761,7 @@ int native_set_objectname(const TCHAR *service_name, void *param, const TCHAR *n
   if (! localsystem) {
     QUERY_SERVICE_CONFIG *qsc = query_service_config(service_name, service_handle);
     if (! qsc) {
-      if (password) SecureZeroMemory(password, _tcslen(password) * sizeof(TCHAR));
+      if (passwordsize) SecureZeroMemory(password, passwordsize);
       return -1;
     }
 
@@ -559,18 +769,21 @@ int native_set_objectname(const TCHAR *service_name, void *param, const TCHAR *n
     HeapFree(GetProcessHeap(), 0, qsc);
   }
 
-  if (grant_logon_as_service(username)) {
-    if (password) SecureZeroMemory(password, _tcslen(password) * sizeof(TCHAR));
-    print_message(stderr, NSSM_MESSAGE_GRANT_LOGON_AS_SERVICE_FAILED, username);
-    return -1;
+  if (! well_known) {
+    if (grant_logon_as_service(username)) {
+      if (passwordsize) SecureZeroMemory(password, passwordsize);
+      print_message(stderr, NSSM_MESSAGE_GRANT_LOGON_AS_SERVICE_FAILED, username);
+      return -1;
+    }
   }
 
   if (! ChangeServiceConfig(service_handle, type, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, 0, 0, 0, 0, username, password, 0)) {
-    if (password) SecureZeroMemory(password, _tcslen(password) * sizeof(TCHAR));
+    if (passwordsize) SecureZeroMemory(password, passwordsize);
     print_message(stderr, NSSM_MESSAGE_CHANGESERVICECONFIG_FAILED, error_string(GetLastError()));
     return -1;
   }
-  if (password) SecureZeroMemory(password, _tcslen(password) * sizeof(TCHAR));
+
+  if (passwordsize) SecureZeroMemory(password, passwordsize);
 
   if (localsystem) return 0;
 
@@ -810,6 +1023,7 @@ settings_t settings[] = {
   { NSSM_REG_AFFINITY, REG_SZ, 0, false, 0, setting_set_affinity, setting_get_affinity },
   { NSSM_REG_ENV, REG_MULTI_SZ, NULL, false, ADDITIONAL_CRLF, setting_set_environment, setting_get_environment },
   { NSSM_REG_ENV_EXTRA, REG_MULTI_SZ, NULL, false, ADDITIONAL_CRLF, setting_set_environment, setting_get_environment },
+  { NSSM_REG_NO_CONSOLE, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_PRIORITY, REG_SZ, (void *) priority_strings[NSSM_NORMAL_PRIORITY], false, 0, setting_set_priority, setting_get_priority },
   { NSSM_REG_RESTART_DELAY, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_STDIN, REG_EXPAND_SZ, NULL, false, 0, setting_set_string, setting_get_string },
@@ -828,16 +1042,19 @@ settings_t settings[] = {
   { NSSM_REG_KILL_CONSOLE_GRACE_PERIOD, REG_DWORD, (void *) NSSM_KILL_CONSOLE_GRACE_PERIOD, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_KILL_WINDOW_GRACE_PERIOD, REG_DWORD, (void *) NSSM_KILL_WINDOW_GRACE_PERIOD, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_KILL_THREADS_GRACE_PERIOD, REG_DWORD, (void *) NSSM_KILL_THREADS_GRACE_PERIOD, false, 0, setting_set_number, setting_get_number },
+  { NSSM_REG_KILL_PROCESS_TREE, REG_DWORD, (void *) 1, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_THROTTLE, REG_DWORD, (void *) NSSM_RESET_THROTTLE_RESTART, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_ROTATE, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_ROTATE_ONLINE, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_ROTATE_SECONDS, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_ROTATE_BYTES_LOW, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },
   { NSSM_REG_ROTATE_BYTES_HIGH, REG_DWORD, 0, false, 0, setting_set_number, setting_get_number },
+  { NSSM_NATIVE_DEPENDONGROUP, REG_MULTI_SZ, NULL, true, ADDITIONAL_CRLF, native_set_dependongroup, native_get_dependongroup },
+  { NSSM_NATIVE_DEPENDONSERVICE, REG_MULTI_SZ, NULL, true, ADDITIONAL_CRLF, native_set_dependonservice, native_get_dependonservice },
   { NSSM_NATIVE_DESCRIPTION, REG_SZ, _T(""), true, 0, native_set_description, native_get_description },
   { NSSM_NATIVE_DISPLAYNAME, REG_SZ, NULL, true, 0, native_set_displayname, native_get_displayname },
   { NSSM_NATIVE_IMAGEPATH, REG_EXPAND_SZ, NULL, true, 0, native_set_imagepath, native_get_imagepath },
-  { NSSM_NATIVE_OBJECTNAME, REG_SZ, NSSM_LOCALSYSTEM_ACCOUNT, true, ADDITIONAL_SETTING, native_set_objectname, native_get_objectname },
+  { NSSM_NATIVE_OBJECTNAME, REG_SZ, NSSM_LOCALSYSTEM_ACCOUNT, true, 0, native_set_objectname, native_get_objectname },
   { NSSM_NATIVE_NAME, REG_SZ, NULL, true, 0, native_set_name, native_get_name },
   { NSSM_NATIVE_STARTUP, REG_SZ, NULL, true, 0, native_set_startup, native_get_startup },
   { NSSM_NATIVE_TYPE, REG_SZ, NULL, true, 0, native_set_type, native_get_type },