HKEY key = (HKEY) param;
TCHAR buffer[VALUE_LENGTH];
- if (expand_parameter(key, (TCHAR *) name, (TCHAR *) buffer, (unsigned long) sizeof(buffer), false, false)) return -1;
+ if (get_string(key, (TCHAR *) name, (TCHAR *) buffer, (unsigned long) sizeof(buffer), false, false, false)) return -1;
return value_from_string(name, value, buffer);
}
return -1;
}
- if (expand_parameter(key, (TCHAR *) name, buffer, buflen, false, true)) {
+ if (get_string(key, (TCHAR *) name, buffer, buflen, false, false, true)) {
HeapFree(GetProcessHeap(), 0, buffer);
return -1;
}
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;
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
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;
}
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;
{ 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 },
{ NSSM_REG_KILL_THREADS_GRACE_PERIOD, REG_DWORD, (void *) NSSM_KILL_THREADS_GRACE_PERIOD, 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_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 },