diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-04-28 13:53:11 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-04-28 13:53:11 +0400 |
| commit | 1838d97b0a27fba6511ee718d527e93000231587 (patch) | |
| tree | f4bb97e6b32970c5c8fb61bf6436c94b4a31dc80 /winsup/cygwin/uinfo.cc | |
| parent | 1754539e56dcde666394354ec603d5524b0d3e90 (diff) | |
* advapi32.cc (GetSecurityDescriptorDacl): Remove.
(GetSecurityDescriptorGroup): Remove.
(GetSecurityDescriptorOwner): Remove.
* sec_acl.cc: Replace above functions throughout with their ntdll.dll
equivalent. Remove redundant debug output.
* sec_auth.cc: Ditto.
* security.cc: Ditto.
* uinfo.cc: Ditto.
Diffstat (limited to 'winsup/cygwin/uinfo.cc')
| -rw-r--r-- | winsup/cygwin/uinfo.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc index 46d4b15a6..dd2d6ed9c 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -84,12 +84,14 @@ cygheap_user::init () psd = (PSECURITY_DESCRIPTOR) (sec_user_nih (sa_buf, sid()))->lpSecurityDescriptor; - BOOL acl_exists, dummy; + NTSTATUS status; + BOOLEAN acl_exists, dummy; TOKEN_DEFAULT_DACL dacl; - if (GetSecurityDescriptorDacl (psd, &acl_exists, &dacl.DefaultDacl, &dummy) - && acl_exists && dacl.DefaultDacl) + + status = RtlGetDaclSecurityDescriptor (psd, &acl_exists, &dacl.DefaultDacl, + &dummy); + if (NT_SUCCESS (status) && acl_exists && dacl.DefaultDacl) { - NTSTATUS status; /* Set the default DACL and the process DACL */ if (!SetTokenInformation (hProcToken, TokenDefaultDacl, &dacl, |