Sync with trunk. (r49792)

svn path=/branches/cmake-bringup/; revision=49803
This commit is contained in:
Sylvain Petreolle 2010-11-26 23:33:34 +00:00
commit f1283c58c6
111 changed files with 4097 additions and 2327 deletions

View file

@ -834,8 +834,8 @@ DWORD RQueryServiceObjectSecurity(
return ERROR_INVALID_HANDLE;
}
if (dwSecurityInformation & (DACL_SECURITY_INFORMATION ||
GROUP_SECURITY_INFORMATION ||
if (dwSecurityInformation & (DACL_SECURITY_INFORMATION |
GROUP_SECURITY_INFORMATION |
OWNER_SECURITY_INFORMATION))
DesiredAccess |= READ_CONTROL;