diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2010-04-17 15:51:09 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2010-04-17 15:51:09 +0000 |
| commit | b5efa8990ffc6e09a09605108d06fcde97127a08 (patch) | |
| tree | 4a2a5e98c88f73d4161fd8d027c3cd3f93b12412 /winsup/cygwin/sec_helper.cc | |
| parent | 7cdcd90ca146cd1322051385d92114b9b927776b (diff) | |
| download | cygnal-b5efa8990ffc6e09a09605108d06fcde97127a08.tar.gz cygnal-b5efa8990ffc6e09a09605108d06fcde97127a08.tar.bz2 cygnal-b5efa8990ffc6e09a09605108d06fcde97127a08.zip | |
* sec_helper.cc (get_null_sd): Make static. Use PSECURITY_DESCRIPTOR
instead of SECURITY_DESCRIPTOR *.
(sec_acl): Fix fomratting.
* security.h (get_null_sd): Drop declaration.
Diffstat (limited to 'winsup/cygwin/sec_helper.cc')
| -rw-r--r-- | winsup/cygwin/sec_helper.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/winsup/cygwin/sec_helper.cc b/winsup/cygwin/sec_helper.cc index cab2feddb..a29900166 100644 --- a/winsup/cygwin/sec_helper.cc +++ b/winsup/cygwin/sec_helper.cc @@ -444,17 +444,16 @@ set_cygwin_privileges (HANDLE token) /* Function to return a common SECURITY_DESCRIPTOR that allows all access. */ - -SECURITY_DESCRIPTOR *__stdcall +static inline PSECURITY_DESCRIPTOR get_null_sd () { static NO_COPY SECURITY_DESCRIPTOR sd; - static NO_COPY SECURITY_DESCRIPTOR *null_sdp; + static NO_COPY PSECURITY_DESCRIPTOR null_sdp; if (!null_sdp) { InitializeSecurityDescriptor (&sd, SECURITY_DESCRIPTOR_REVISION); - SetSecurityDescriptorDacl (&sd, TRUE, 0, FALSE); + SetSecurityDescriptorDacl (&sd, TRUE, NULL, FALSE); null_sdp = &sd; } return null_sdp; @@ -478,7 +477,7 @@ init_global_security () bool sec_acl (PACL acl, bool original, bool admins, PSID sid1, PSID sid2, DWORD access2) { - size_t acl_len = MAX_DACL_LEN(5); + size_t acl_len = MAX_DACL_LEN (5); LPVOID pAce; cygpsid psid; |