[SERVICES]: Addendum to r73486: Start all services within LocalSystem account as a temporary measure in trunk until we completely support per-service account logging.

CORE-12541, CORE-12279

svn path=/trunk/; revision=73487
This commit is contained in:
Hermès Bélusca-Maïto 2016-12-27 15:26:01 +00:00
parent a35a785b11
commit 0ce031f74d

View file

@ -203,10 +203,14 @@ ScmLogonService(
if (ScmIsLocalSystemAccount(pImage->pszAccountName)) if (ScmIsLocalSystemAccount(pImage->pszAccountName))
return ERROR_SUCCESS; return ERROR_SUCCESS;
// FIXME: Always assume LocalSystem
return ERROR_SUCCESS;
#if 0
ptr = wcschr(pImage->pszAccountName, L'\\'); ptr = wcschr(pImage->pszAccountName, L'\\');
if (ptr != NULL) if (ptr != NULL)
{ {
*ptr = 0; *ptr = L'\0';
pUserName = ptr + 1; pUserName = ptr + 1;
pDomainName = pImage->pszAccountName; pDomainName = pImage->pszAccountName;
@ -224,11 +228,11 @@ ScmLogonService(
DPRINT("Domain: %S User: %S\n", pDomainName, pUserName); DPRINT("Domain: %S User: %S\n", pDomainName, pUserName);
/* FIXME */ /* Logon the user */
#if 0 // FIXME: Use the password!!
if (!LogonUserW(pUserName, if (!LogonUserW(pUserName,
pDomainName, pDomainName,
L"", // lpszPassword, L"", // FIXME: lpszPassword,
LOGON32_LOGON_SERVICE, LOGON32_LOGON_SERVICE,
LOGON32_PROVIDER_DEFAULT, LOGON32_PROVIDER_DEFAULT,
&pImage->hToken)) &pImage->hToken))
@ -236,12 +240,12 @@ ScmLogonService(
dwError = GetLastError(); dwError = GetLastError();
DPRINT1("LogonUserW() failed (Error %lu)\n", dwError); DPRINT1("LogonUserW() failed (Error %lu)\n", dwError);
} }
#endif
if (ptr != NULL) if (ptr != NULL)
*ptr = L'\\'; *ptr = L'\\';
return dwError; return dwError;
#endif
} }