libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-22 00:38:06 +08:00
Code Issues Projects Releases Wiki Activity

sec_acl.cc: Cosmetic changes

Browse Source 
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-12-24 00:24:39 +01:00
parent ad7b3cde9c
commit 62fe4404a7
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,7 @@
2015-12-24 Corinna Vinschen <corinna@vinschen.de>
* sec_acl.cc: Cosmetic changes.
2015-12-18 Corinna Vinschen <corinna@vinschen.de> 2015-12-18 Corinna Vinschen <corinna@vinschen.de>
* strfuncs.cc (sys_cp_wcstombs): Delete and move functionality into * strfuncs.cc (sys_cp_wcstombs): Delete and move functionality into

28
winsup/cygwin/sec_acl.cc
View File

@ -1,4 +1,4 @@
/* sec_acl.cc: Sun compatible ACL functions. /* sec_acl.cc: Solaris compatible ACL functions.
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
2011, 2012, 2014, 2015 Red Hat, Inc. 2011, 2012, 2014, 2015 Red Hat, Inc.
@ -96,18 +96,6 @@ details. */
| CYG_ACE_MASK_VALID) | CYG_ACE_MASK_VALID)
#define CYG_ACE_NEW_STYLE READ_CONTROL /* New style if set. */ #define CYG_ACE_NEW_STYLE READ_CONTROL /* New style if set. */
int
searchace (aclent_t *aclp, int nentries, int type, uid_t id)
{
int i;
for (i = 0; i < nentries; ++i)
if ((aclp[i].a_type == type && (id == ILLEGAL_UID || aclp[i].a_id == id))
|| !aclp[i].a_type)
return i;
return -1;
}
/* Define own bit masks rather than using the GENERIC masks. The latter /* Define own bit masks rather than using the GENERIC masks. The latter
also contain standard rights, which we don't need here. */ also contain standard rights, which we don't need here. */
#define FILE_ALLOW_READ (FILE_READ_DATA | FILE_READ_ATTRIBUTES | \ #define FILE_ALLOW_READ (FILE_READ_DATA | FILE_READ_ATTRIBUTES | \
@ -124,6 +112,18 @@ searchace (aclent_t *aclp, int nentries, int type, uid_t id)
#define STD_RIGHTS_OTHER (STANDARD_RIGHTS_READ | SYNCHRONIZE) #define STD_RIGHTS_OTHER (STANDARD_RIGHTS_READ | SYNCHRONIZE)
#define STD_RIGHTS_OWNER (STANDARD_RIGHTS_ALL | SYNCHRONIZE) #define STD_RIGHTS_OWNER (STANDARD_RIGHTS_ALL | SYNCHRONIZE)
int
searchace (aclent_t *aclp, int nentries, int type, uid_t id)
{
int i;
for (i = 0; i < nentries; ++i)
if ((aclp[i].a_type == type && (id == ILLEGAL_UID || aclp[i].a_id == id))
|| !aclp[i].a_type)
return i;
return -1;
}
/* From the attributes and the POSIX ACL list, compute a new-style Cygwin /* From the attributes and the POSIX ACL list, compute a new-style Cygwin
security descriptor. The function returns a pointer to the security descriptor. The function returns a pointer to the
SECURITY_DESCRIPTOR in sd_ret, or NULL if the function fails. SECURITY_DESCRIPTOR in sd_ret, or NULL if the function fails.
@ -1705,7 +1705,7 @@ acltotext (__aclent16_t *aclbufp, int aclcnt)
} }
extern "C" __aclent16_t * extern "C" __aclent16_t *
aclfromtext (char *acltextp, int * aclcnt) aclfromtext (char *acltextp, int *aclcnt)
{ {
return (__aclent16_t *) aclfromtext32 (acltextp, aclcnt); return (__aclent16_t *) aclfromtext32 (acltextp, aclcnt);
} }