mirror of https://github.com/Icinga/icinga2.git
Remove redundant checks in check_procs
This commit is contained in:
parent
8a062a688b
commit
3087be2567
|
@ -297,14 +297,8 @@ int countProcs(const wstring user)
|
||||||
pSIDTokenUser = reinterpret_cast<PTOKEN_USER>(new BYTE[dwReturnLength]);
|
pSIDTokenUser = reinterpret_cast<PTOKEN_USER>(new BYTE[dwReturnLength]);
|
||||||
memset(pSIDTokenUser, 0, dwReturnLength);
|
memset(pSIDTokenUser, 0, dwReturnLength);
|
||||||
|
|
||||||
if (!pSIDTokenUser) {
|
|
||||||
if (debug)
|
|
||||||
wcout << L"Could not recieve token, skiping" << endl;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (debug)
|
if (debug)
|
||||||
wcout << L"Recieved token, saving information" << endl;
|
wcout << L"Received token, saving information" << endl;
|
||||||
|
|
||||||
//write Info in pSIDTokenUser
|
//write Info in pSIDTokenUser
|
||||||
if (!GetTokenInformation(hToken, TokenUser, pSIDTokenUser, dwReturnLength, NULL))
|
if (!GetTokenInformation(hToken, TokenUser, pSIDTokenUser, dwReturnLength, NULL))
|
||||||
|
@ -327,9 +321,6 @@ int countProcs(const wstring user)
|
||||||
AcctName = reinterpret_cast<LPWSTR>(new WCHAR[dwAcctName]);
|
AcctName = reinterpret_cast<LPWSTR>(new WCHAR[dwAcctName]);
|
||||||
DomainName = reinterpret_cast<LPWSTR>(new WCHAR[dwDomainName]);
|
DomainName = reinterpret_cast<LPWSTR>(new WCHAR[dwDomainName]);
|
||||||
|
|
||||||
if (!AcctName || !DomainName)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (!LookupAccountSid(NULL, pSIDTokenUser->User.Sid, AcctName,
|
if (!LookupAccountSid(NULL, pSIDTokenUser->User.Sid, AcctName,
|
||||||
(LPDWORD)&dwAcctName, DomainName, (LPDWORD)&dwDomainName, &sidNameUse))
|
(LPDWORD)&dwAcctName, DomainName, (LPDWORD)&dwDomainName, &sidNameUse))
|
||||||
continue;
|
continue;
|
||||||
|
@ -346,7 +337,6 @@ int countProcs(const wstring user)
|
||||||
delete[] reinterpret_cast<LPWSTR>(DomainName);
|
delete[] reinterpret_cast<LPWSTR>(DomainName);
|
||||||
|
|
||||||
} while (Process32Next(hProcessSnap, &pe32));
|
} while (Process32Next(hProcessSnap, &pe32));
|
||||||
|
|
||||||
|
|
||||||
die:
|
die:
|
||||||
if (hProcessSnap)
|
if (hProcessSnap)
|
||||||
|
@ -358,4 +348,4 @@ die:
|
||||||
if (pSIDTokenUser)
|
if (pSIDTokenUser)
|
||||||
delete[] reinterpret_cast<PTOKEN_USER>(pSIDTokenUser);
|
delete[] reinterpret_cast<PTOKEN_USER>(pSIDTokenUser);
|
||||||
return numProcs;
|
return numProcs;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue