diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-04-29 14:38:12 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-04-29 14:38:12 +0400 |
| commit | 5735d5f6f4cc65cb8afcbd7da83165b6e9cbc5d8 (patch) | |
| tree | 8410d0cb5a9ea6b1cb226821d22cd5416e47e968 /winsup/cygwin/security.cc | |
| parent | 3e8e0c33c00e384867d394c9a84a3d31f5208a61 (diff) | |
* advapi32.cc: Add comment.
(EqualSid): Remove.
(CopySid): Remove.
(AddAccessAllowedAce): Remove.
(AddAccessDeniedAce): Remove.
(MakeSelfRelativeSD): Remove.
* flock.cc: Replace above functions throughout with their ntdll.dll
equivalent.
* sec_acl.cc: Ditto.
* sec_auth.cc: Ditto.
* sec_helper.cc: Ditto.
* security.cc: Ditto.
* security.h: Ditto.
(RtlEqualSid): Declare. Explain why.
(RtlCopySid): Ditto.
Diffstat (limited to 'winsup/cygwin/security.cc')
| -rw-r--r-- | winsup/cygwin/security.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc index 7530b703a..a52fc26ac 100644 --- a/winsup/cygwin/security.cc +++ b/winsup/cygwin/security.cc @@ -316,7 +316,7 @@ get_attribute_from_acl (mode_t *attribute, PACL acl, PSID owner_sid, } } *attribute &= ~(S_IRWXU | S_IRWXG | S_IRWXO | S_ISVTX | S_ISGID | S_ISUID); - if (owner_sid && group_sid && EqualSid (owner_sid, group_sid) + if (owner_sid && group_sid && RtlEqualSid (owner_sid, group_sid) /* FIXME: temporary exception for /var/empty */ && well_known_system_sid != group_sid) { @@ -469,9 +469,10 @@ bool add_access_allowed_ace (PACL acl, int offset, DWORD attributes, PSID sid, size_t &len_add, DWORD inherit) { - if (!AddAccessAllowedAce (acl, ACL_REVISION, attributes, sid)) + NTSTATUS status = RtlAddAccessAllowedAce (acl, ACL_REVISION, attributes, sid); + if (!NT_SUCCESS (status)) { - __seterrno (); + __seterrno_from_nt_status (status); return false; } ACCESS_ALLOWED_ACE *ace; @@ -485,9 +486,10 @@ bool add_access_denied_ace (PACL acl, int offset, DWORD attributes, PSID sid, size_t &len_add, DWORD inherit) { - if (!AddAccessDeniedAce (acl, ACL_REVISION, attributes, sid)) + NTSTATUS status = RtlAddAccessDeniedAce (acl, ACL_REVISION, attributes, sid); + if (!NT_SUCCESS (status)) { - __seterrno (); + __seterrno_from_nt_status (status); return false; } ACCESS_DENIED_ACE *ace; @@ -839,7 +841,7 @@ alloc_sd (path_conv &pc, __uid32_t uid, __gid32_t gid, int attribute, /* Make self relative security descriptor. */ DWORD sd_size = 0; - MakeSelfRelativeSD (&sd, sd_ret, &sd_size); + RtlAbsoluteToSelfRelativeSD (&sd, sd_ret, &sd_size); if (sd_size <= 0) { __seterrno (); @@ -850,9 +852,10 @@ alloc_sd (path_conv &pc, __uid32_t uid, __gid32_t gid, int attribute, set_errno (ENOMEM); return NULL; } - if (!MakeSelfRelativeSD (&sd, sd_ret, &sd_size)) + status = RtlAbsoluteToSelfRelativeSD (&sd, sd_ret, &sd_size); + if (!NT_SUCCESS (status)) { - __seterrno (); + __seterrno_from_nt_status (status); return NULL; } debug_printf ("Created SD-Size: %u", sd_ret.size ()); |