JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* setfacl.c (getaclentry): Allow to delete default entries for the

Browse Source 
owner and owner group.
This commit is contained in:
Corinna Vinschen 2009-11-29 14:28:29 +00:00
parent ff928075e9
commit 19ac72547f
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@ -1,3 +1,8 @@
2009-11-29 Corinna Vinschen <corinna@vinschen.de>
* setfacl.c (getaclentry): Allow to delete default entries for the
owner and owner group.
2009-11-27 Corinna Vinschen <corinna@vinschen.de> 2009-11-27 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (dump_sysinfo): Fix typo in products. * cygcheck.cc (dump_sysinfo): Fix typo in products.

15
winsup/utils/setfacl.c
View File

@ -120,9 +120,18 @@ getaclentry (action_t action, char *c, aclent_t *ace)
return FALSE; return FALSE;
*c2 = '\0'; *c2 = '\0';
} }
else if (action != Delete) else if (action == Delete)
{
/* Only default ugo entries are allowed to be removed, not the
standard ugo entries. */
if (!(ace->a_type & ACL_DEFAULT))
return FALSE;
}
else
return FALSE; return FALSE;
if (c2 == c) if (!c2 && !*c) /* Deleting a default ug entry is allowed. */
;
else if (c2 == c)
{ {
if (action == Delete) if (action == Delete)
return FALSE; return FALSE;
@ -149,7 +158,7 @@ getaclentry (action_t action, char *c, aclent_t *ace)
return FALSE; return FALSE;
ace->a_id = gr->gr_gid; ace->a_id = gr->gr_gid;
} }
if (c2 != c) if (c2 && c2 != c)
{ {
if (ace->a_type & USER_OBJ) if (ace->a_type & USER_OBJ)
{ {