X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=service.cpp;h=296d4166dcaafcaac8df9ce1c352649a11ab84b6;hb=4b7c8eec508cc90d80355fad5df80163a181ddcb;hp=2f1ceb02d91b775a6f4f6e355159eff3c0b570f2;hpb=1c7716c9a9bf3e8dd844fd27d1351dab6ceaf510;p=nssm.git

diff --git a/service.cpp b/service.cpp
index 2f1ceb0..296d416 100644
--- a/service.cpp
+++ b/service.cpp
@@ -3,14 +3,14 @@
 /* This is explicitly a wide string. */
 #define NSSM_LOGON_AS_SERVICE_RIGHT L"SeServiceLogonRight"
 
-extern const TCHAR *exit_action_strings[];
-
 bool is_admin;
 bool use_critical_section;
 
 extern imports_t imports;
+extern settings_t settings[];
 
 const TCHAR *exit_action_strings[] = { _T("Restart"), _T("Ignore"), _T("Exit"), _T("Suicide"), 0 };
+const TCHAR *startup_strings[] = { _T("SERVICE_AUTO_START"), _T("SERVICE_DELAYED_AUTO_START"), _T("SERVICE_DEMAND_START"), _T("SERVICE_DISABLED"), 0 };
 
 static inline int throttle_milliseconds(unsigned long throttle) {
   /* pow() operates on doubles. */
@@ -37,7 +37,152 @@ SC_HANDLE open_service_manager() {
   return ret;
 }
 
-static int grant_logon_as_service(const TCHAR *username) {
+QUERY_SERVICE_CONFIG *query_service_config(const TCHAR *service_name, SC_HANDLE service_handle) {
+  QUERY_SERVICE_CONFIG *qsc;
+  unsigned long bufsize;
+  unsigned long error;
+
+  QueryServiceConfig(service_handle, 0, 0, &bufsize);
+  error = GetLastError();
+  if (error == ERROR_INSUFFICIENT_BUFFER) {
+    qsc = (QUERY_SERVICE_CONFIG *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufsize);
+    if (! qsc) {
+      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("QUERY_SERVICE_CONFIG"), _T("query_service_config()"), 0);
+      return 0;
+    }
+  }
+  else {
+    print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG_FAILED, service_name, error_string(error), 0);
+    return 0;
+  }
+
+  if (! QueryServiceConfig(service_handle, qsc, bufsize, &bufsize)) {
+    HeapFree(GetProcessHeap(), 0, qsc);
+    print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG_FAILED, service_name, error_string(GetLastError()), 0);
+    return 0;
+  }
+
+  return qsc;
+}
+
+int set_service_description(const TCHAR *service_name, SC_HANDLE service_handle, TCHAR *buffer) {
+  SERVICE_DESCRIPTION description;
+  ZeroMemory(&description, sizeof(description));
+  /*
+    lpDescription must be NULL if we aren't changing, the new description
+    or "".
+  */
+  if (buffer && buffer[0]) description.lpDescription = buffer;
+  else description.lpDescription = _T("");
+
+  if (ChangeServiceConfig2(service_handle, SERVICE_CONFIG_DESCRIPTION, &description)) return 0;
+
+  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SERVICE_CONFIG_DESCRIPTION_FAILED, service_name, error_string(GetLastError()), 0);
+  return 1;
+}
+
+int get_service_description(const TCHAR *service_name, SC_HANDLE service_handle, unsigned long len, TCHAR *buffer) {
+  if (! buffer) return 1;
+
+  unsigned long bufsize;
+  QueryServiceConfig2(service_handle, SERVICE_CONFIG_DESCRIPTION, 0, 0, &bufsize);
+  unsigned long error = GetLastError();
+  if (error == ERROR_INSUFFICIENT_BUFFER) {
+    SERVICE_DESCRIPTION *description = (SERVICE_DESCRIPTION *) HeapAlloc(GetProcessHeap(), 0, bufsize);
+    if (! description) {
+      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("SERVICE_CONFIG_DESCRIPTION"), _T("get_service_description()"));
+      return 2;
+    }
+
+    if (QueryServiceConfig2(service_handle, SERVICE_CONFIG_DESCRIPTION, (unsigned char *) description, bufsize, &bufsize)) {
+      if (description->lpDescription) _sntprintf_s(buffer, len, _TRUNCATE, _T("%s"), description->lpDescription);
+      else ZeroMemory(buffer, len * sizeof(TCHAR));
+      HeapFree(GetProcessHeap(), 0, description);
+      return 0;
+    }
+    else {
+      HeapFree(GetProcessHeap(), 0, description);
+      print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service_name, _T("SERVICE_CONFIG_DESCRIPTION"), error_string(error));
+      return 3;
+    }
+  }
+  else {
+    print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service_name, _T("SERVICE_CONFIG_DESCRIPTION"), error_string(error));
+    return 4;
+  }
+
+  return 0;
+}
+
+int get_service_startup(const TCHAR *service_name, SC_HANDLE service_handle, const QUERY_SERVICE_CONFIG *qsc, unsigned long *startup) {
+  if (! qsc) return 1;
+
+  switch (qsc->dwStartType) {
+    case SERVICE_DEMAND_START: *startup = NSSM_STARTUP_MANUAL; break;
+    case SERVICE_DISABLED: *startup = NSSM_STARTUP_DISABLED; break;
+    default: *startup = NSSM_STARTUP_AUTOMATIC;
+  }
+
+  if (*startup != NSSM_STARTUP_AUTOMATIC) return 0;
+
+  /* Check for delayed start. */
+  unsigned long bufsize;
+  unsigned long error;
+  QueryServiceConfig2(service_handle, SERVICE_CONFIG_DELAYED_AUTO_START_INFO, 0, 0, &bufsize);
+  error = GetLastError();
+  if (error == ERROR_INSUFFICIENT_BUFFER) {
+    SERVICE_DELAYED_AUTO_START_INFO *info = (SERVICE_DELAYED_AUTO_START_INFO *) HeapAlloc(GetProcessHeap(), 0, bufsize);
+    if (! info) {
+      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("SERVICE_DELAYED_AUTO_START_INFO"), _T("get_service_startup()"));
+      return 2;
+    }
+
+    if (QueryServiceConfig2(service_handle, SERVICE_CONFIG_DELAYED_AUTO_START_INFO, (unsigned char *) info, bufsize, &bufsize)) {
+      if (info->fDelayedAutostart) *startup = NSSM_STARTUP_DELAYED;
+      HeapFree(GetProcessHeap(), 0, info);
+      return 0;
+    }
+    else {
+      error = GetLastError();
+      if (error != ERROR_INVALID_LEVEL) {
+        print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service_name, _T("SERVICE_CONFIG_DELAYED_AUTO_START_INFO"), error_string(error));
+        return 3;
+      }
+    }
+  }
+  else if (error != ERROR_INVALID_LEVEL) {
+    print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service_name, _T("SERVICE_DELAYED_AUTO_START_INFO"), error_string(error));
+    return 3;
+  }
+
+  return 0;
+}
+
+int get_service_username(const TCHAR *service_name, const QUERY_SERVICE_CONFIG *qsc, TCHAR **username, size_t *usernamelen) {
+  if (! username) return 1;
+  if (! usernamelen) return 1;
+
+  *username = 0;
+  *usernamelen = 0;
+
+  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 (str_equiv(username, NSSM_LOCALSYSTEM_ACCOUNT)) return 0;
 
   /* Open Policy object. */
@@ -274,10 +419,69 @@ int pre_install_service(int argc, TCHAR **argv) {
 /* About to edit the service. */
 int pre_edit_service(int argc, TCHAR **argv) {
   /* Require service name. */
-  if (argc < 1) return usage(1);
+  if (argc < 2) return usage(1);
+
+  /* Are we editing on the command line? */
+  enum { MODE_EDITING, MODE_GETTING, MODE_SETTING, MODE_RESETTING } mode = MODE_EDITING;
+  const TCHAR *verb = argv[0];
+  const TCHAR *service_name = argv[1];
+  bool getting = false;
+  bool unsetting = false;
+
+  /* Minimum number of arguments. */
+  int mandatory = 2;
+  /* Index of first value. */
+  int remainder = 3;
+  int i;
+  if (str_equiv(verb, _T("get"))) {
+    mandatory = 3;
+    mode = MODE_GETTING;
+  }
+  else if (str_equiv(verb, _T("set"))) {
+    mandatory = 4;
+    mode = MODE_SETTING;
+  }
+  else if (str_equiv(verb, _T("reset")) || str_equiv(verb, _T("unset"))) {
+    mandatory = 3;
+    mode = MODE_RESETTING;
+  }
+  if (argc < mandatory) return usage(1);
+
+  const TCHAR *parameter = 0;
+  settings_t *setting = 0;
+  TCHAR *additional;
+
+  /* Validate the parameter. */
+  if (mandatory > 2) {
+    bool additional_mandatory = false;
+
+    parameter = argv[2];
+    for (i = 0; settings[i].name; i++) {
+      setting = &settings[i];
+      if (! str_equiv(setting->name, parameter)) continue;
+      if (((setting->additional & ADDITIONAL_GETTING) && mode == MODE_GETTING) || ((setting->additional & ADDITIONAL_SETTING) && mode == MODE_SETTING) || ((setting->additional & ADDITIONAL_RESETTING) && mode == MODE_RESETTING)) {
+        additional_mandatory = true;
+        mandatory++;
+      }
+      break;
+    }
+    if (! settings[i].name) {
+      print_message(stderr, NSSM_MESSAGE_INVALID_PARAMETER, parameter);
+      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) {
+      additional = argv[3];
+      remainder = 4;
+    }
+    else additional = argv[remainder];
+  }
 
   nssm_service_t *service = alloc_nssm_service();
-  _sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), argv[0]);
+  _sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), service_name);
 
   /* Open service manager */
   SC_HANDLE services = open_service_manager();
@@ -295,67 +499,46 @@ int pre_edit_service(int argc, TCHAR **argv) {
   }
 
   /* Get system details. */
-  unsigned long bufsize;
-  unsigned long error;
-  QUERY_SERVICE_CONFIG *qsc;
-
-  QueryServiceConfig(service->handle, 0, 0, &bufsize);
-  error = GetLastError();
-  if (error == ERROR_INSUFFICIENT_BUFFER) {
-    qsc = (QUERY_SERVICE_CONFIG *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufsize);
-    if (! qsc) {
-      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("QUERY_SERVICE_CONFIG"), _T("pre_edit_service()"), 0);
-      return 4;
-    }
-  }
-  else {
-    CloseHandle(service->handle);
-    CloseServiceHandle(services);
-    print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG_FAILED, service->name, error_string(error), 0);
-    return 4;
-  }
-
-  if (! QueryServiceConfig(service->handle, qsc, bufsize, &bufsize)) {
-    HeapFree(GetProcessHeap(), 0, qsc);
+  QUERY_SERVICE_CONFIG *qsc = query_service_config(service->name, service->handle);
+  if (! qsc) {
     CloseHandle(service->handle);
     CloseServiceHandle(services);
-    print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG_FAILED, service->name, error_string(GetLastError()), 0);
     return 4;
   }
 
   service->type = qsc->dwServiceType;
   if (! (service->type & SERVICE_WIN32_OWN_PROCESS)) {
-    HeapFree(GetProcessHeap(), 0, qsc);
-    CloseHandle(service->handle);
-    CloseServiceHandle(services);
-    print_message(stderr, NSSM_MESSAGE_CANNOT_EDIT, service->name, _T("SERVICE_WIN32_OWN_PROCESS"), 0);
-    return 3;
+    if (mode != MODE_GETTING) {
+      HeapFree(GetProcessHeap(), 0, qsc);
+      CloseHandle(service->handle);
+      CloseServiceHandle(services);
+      print_message(stderr, NSSM_MESSAGE_CANNOT_EDIT, service->name, NSSM_WIN32_OWN_PROCESS, 0);
+      return 3;
+    }
   }
 
-  switch (qsc->dwStartType) {
-    case SERVICE_DEMAND_START: service->startup = NSSM_STARTUP_MANUAL; break;
-    case SERVICE_DISABLED: service->startup = NSSM_STARTUP_DISABLED; break;
-    default: service->startup = NSSM_STARTUP_AUTOMATIC;
-  }
-  if (! str_equiv(qsc->lpServiceStartName, NSSM_LOCALSYSTEM_ACCOUNT)) {
-    size_t len = _tcslen(qsc->lpServiceStartName);
-    service->username = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(TCHAR));
-    if (service->username) {
-      memmove(service->username, qsc->lpServiceStartName, (len + 1) * sizeof(TCHAR));
-      service->usernamelen = (unsigned long) len;
-    }
-    else {
+  if (get_service_startup(service->name, service->handle, qsc, &service->startup)) {
+    if (mode != MODE_GETTING) {
       HeapFree(GetProcessHeap(), 0, qsc);
       CloseHandle(service->handle);
       CloseServiceHandle(services);
-      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("username"), _T("pre_edit_service()"));
       return 4;
     }
   }
+
+  if (get_service_username(service->name, qsc, &service->username, &service->usernamelen)) {
+    if (mode != MODE_GETTING) {
+      HeapFree(GetProcessHeap(), 0, qsc);
+      CloseHandle(service->handle);
+      CloseServiceHandle(services);
+      return 5;
+    }
+  }
+
   _sntprintf_s(service->displayname, _countof(service->displayname), _TRUNCATE, _T("%s"), qsc->lpDisplayName);
 
   /* Get the canonical service name. We open it case insensitively. */
-  bufsize = _countof(service->name);
+  unsigned long bufsize = _countof(service->name);
   GetServiceKeyName(services, service->displayname, service->name, &bufsize);
 
   /* Remember the executable in case it isn't NSSM. */
@@ -363,80 +546,126 @@ int pre_edit_service(int argc, TCHAR **argv) {
   HeapFree(GetProcessHeap(), 0, qsc);
 
   /* Get extended system details. */
-  if (service->startup == NSSM_STARTUP_AUTOMATIC) {
-    QueryServiceConfig2(service->handle, SERVICE_CONFIG_DELAYED_AUTO_START_INFO, 0, 0, &bufsize);
-    error = GetLastError();
-    if (error == ERROR_INSUFFICIENT_BUFFER) {
-      SERVICE_DELAYED_AUTO_START_INFO *info = (SERVICE_DELAYED_AUTO_START_INFO *) HeapAlloc(GetProcessHeap(), 0, bufsize);
-      if (! info) {
-        CloseHandle(service->handle);
-        CloseServiceHandle(services);
-        print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("SERVICE_DELAYED_AUTO_START_INFO"), _T("pre_edit_service()"));
-        return 5;
-      }
+  if (get_service_description(service->name, service->handle, _countof(service->description), service->description)) {
+    if (mode != MODE_GETTING) {
+      CloseHandle(service->handle);
+      CloseServiceHandle(services);
+      return 6;
+    }
+  }
 
-      if (QueryServiceConfig2(service->handle, SERVICE_CONFIG_DELAYED_AUTO_START_INFO, (unsigned char *) info, bufsize, &bufsize)) {
-        if (info->fDelayedAutostart) service->startup = NSSM_STARTUP_DELAYED;
-      }
-      else {
-        error = GetLastError();
-        if (error != ERROR_INVALID_LEVEL) {
-          CloseHandle(service->handle);
-          CloseServiceHandle(services);
-          print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service->name, _T("SERVICE_CONFIG_DELAYED_AUTO_START_INFO"), error_string(error));
-          return 5;
-        }
-      }
+  /* Get NSSM details. */
+  get_parameters(service, 0);
+
+  CloseServiceHandle(services);
+
+  if (! service->exe[0]) {
+    service->native = true;
+    if (mode != MODE_GETTING) print_message(stderr, NSSM_MESSAGE_INVALID_SERVICE, service->name, NSSM, service->image);
+  }
+
+  /* Editing with the GUI. */
+  if (mode == MODE_EDITING) {
+    nssm_gui(IDD_EDIT, service);
+    return 0;
+  }
+
+  /* Trying to manage App* parameters for a non-NSSM service. */
+  if (! setting->native && service->native) {
+    CloseHandle(service->handle);
+    print_message(stderr, NSSM_MESSAGE_NATIVE_PARAMETER, setting->name, NSSM);
+    return 1;
+  }
+
+  HKEY key;
+  value_t value;
+  int ret;
+
+  if (mode == MODE_GETTING) {
+    if (! service->native) {
+      key = open_registry(service->name, KEY_READ);
+      if (! key) return 4;
     }
-    else if (error != ERROR_INVALID_LEVEL) {
+
+    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(services);
-      print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service->name, _T("SERVICE_DELAYED_AUTO_START_INFO"), error_string(error));
       return 5;
     }
+
+    switch (setting->type) {
+      case REG_EXPAND_SZ:
+      case REG_MULTI_SZ:
+      case REG_SZ:
+        _tprintf(_T("%s\n"), value.string ? value.string : _T(""));
+        HeapFree(GetProcessHeap(), 0, value.string);
+        break;
+
+      case REG_DWORD:
+        _tprintf(_T("%u\n"), value.numeric);
+        break;
+    }
+
+    if (! service->native) RegCloseKey(key);
+    CloseHandle(service->handle);
+    return 0;
   }
 
-  QueryServiceConfig2(service->handle, SERVICE_CONFIG_DESCRIPTION, 0, 0, &bufsize);
-  error = GetLastError();
-  if (error == ERROR_INSUFFICIENT_BUFFER) {
-    SERVICE_DESCRIPTION *description = (SERVICE_DESCRIPTION *) HeapAlloc(GetProcessHeap(), 0, bufsize);
-    if (! description) {
+  /* Build the value. */
+  if (mode == MODE_RESETTING) {
+    /* Unset the parameter. */
+    value.string = 0;
+  }
+  else {
+    /* Set the parameter. */
+    size_t len = 0;
+    size_t delimiterlen = (setting->additional & ADDITIONAL_CRLF) ? 2 : 1;
+    for (i = remainder; i < argc; i++) len += _tcslen(argv[i]) + delimiterlen;
+    len++;
+
+    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(services);
-      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("SERVICE_CONFIG_DESCRIPTION"), _T("pre_edit_service()"));
-      return 6;
+      return 2;
     }
 
-    if (QueryServiceConfig2(service->handle, SERVICE_CONFIG_DESCRIPTION, (unsigned char *) description, bufsize, &bufsize)) {
-     if (description->lpDescription) _sntprintf_s(service->description, _countof(service->description), _TRUNCATE, _T("%s"), description->lpDescription);
-      HeapFree(GetProcessHeap(), 0, description);
+    size_t s = 0;
+    for (i = remainder; i < argc; i++) {
+      size_t len = _tcslen(argv[i]);
+      memmove(value.string + s, argv[i], len * sizeof(TCHAR));
+      s += len;
+      if (i < argc - 1) {
+        if (setting->additional & ADDITIONAL_CRLF) {
+          value.string[s++] = _T('\r');
+          value.string[s++] = _T('\n');
+        }
+        else value.string[s++] = _T(' ');
+      }
     }
-    else {
-      HeapFree(GetProcessHeap(), 0, description);
-      CloseHandle(service->handle);
-      CloseServiceHandle(services);
-      print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service->name, _T("SERVICE_CONFIG_DELAYED_AUTO_START_INFO"), error_string(error));
-      return 6;
+    value.string[s] = _T('\0');
+  }
+
+  if (! service->native) {
+    key = open_registry(service->name, KEY_WRITE);
+    if (! key) {
+      if (value.string) HeapFree(GetProcessHeap(), 0, value.string);
+      return 4;
     }
   }
-  else {
+
+  if (setting->native) ret = set_setting(service->name, service->handle, setting, &value, additional);
+  else ret = set_setting(service->name, key, setting, &value, additional);
+  if (value.string) HeapFree(GetProcessHeap(), 0, value.string);
+  if (ret < 0) {
+    if (! service->native) RegCloseKey(key);
     CloseHandle(service->handle);
-    CloseServiceHandle(services);
-    print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service->name, _T("SERVICE_CONFIG_DELAYED_AUTO_START_INFO"), error_string(error));
     return 6;
   }
 
-  /* Get NSSM details. */
-  get_parameters(service, 0);
-
-  CloseServiceHandle(services);
-
-  if (! service->exe[0]) {
-    print_message(stderr, NSSM_MESSAGE_INVALID_SERVICE, service->name, NSSM, service->image);
-    service->native = true;
-  }
-
-  nssm_gui(IDD_EDIT, service);
+  if (! service->native) RegCloseKey(key);
+  CloseHandle(service->handle);
 
   return 0;
 }
@@ -519,7 +748,7 @@ int edit_service(nssm_service_t *service, bool editing) {
 
   /*
     Username must be NULL if we aren't changing or an account name.
-    We must explicitly user LOCALSYSTEM to change it when we are editing.
+    We must explicitly use LOCALSYSTEM to change it when we are editing.
     Password must be NULL if we aren't changing, a password or "".
     Empty passwords are valid but we won't allow them in the GUI.
   */
@@ -543,13 +772,7 @@ int edit_service(nssm_service_t *service, bool editing) {
   }
 
   if (service->description[0] || editing) {
-    SERVICE_DESCRIPTION description;
-    ZeroMemory(&description, sizeof(description));
-    if (service->description[0]) description.lpDescription = service->description;
-    else description.lpDescription = 0;
-    if (! ChangeServiceConfig2(service->handle, SERVICE_CONFIG_DESCRIPTION, &description)) {
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SERVICE_CONFIG_DESCRIPTION_FAILED, service->name, error_string(GetLastError()), 0);
-    }
+    set_service_description(service->name, service->handle, service->description);
   }
 
   SERVICE_DELAYED_AUTO_START_INFO delayed;