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

* setfacl.c (getaclentry): Fix return value in case of a lone 'm' if

Browse Source 
action is Delete.  Drop requirement for a trailing colon if action is
	Delete.
This commit is contained in:
Corinna Vinschen
2014-09-03 08:57:20 +00:00
parent 7a1cf1a003
commit 89d195a7d1
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/utils/ChangeLog
View File

@@ -1,3 +1,9 @@
2014-09-03 Corinna Vinschen <corinna@vinschen.de>
* setfacl.c (getaclentry): Fix return value in case of a lone 'm' if
action is Delete. Drop requirement for a trailing colon if action is
Delete.
2014-08-31 Corinna Vinschen <corinna@vinschen.de>
* setfacl.c (usage): Drop outdated note that default ACEs are not

6
winsup/utils/setfacl.c
View File

@@ -108,8 +108,8 @@ getaclentry (action_t action, char *c, aclent_t *ace)
return FALSE;
/* Skip to next field. */
c = c2;
if (!*c && action != Delete)
return FALSE;
if (!*c)
return action == Delete && (ace->a_type & CLASS_OBJ);
/* If this is a user or group entry, check if next char is a colon char.
If so, skip it, otherwise it's the name of a user or group. */
if (!(ace->a_type & (USER_OBJ | GROUP_OBJ)))
@@ -131,8 +131,6 @@ getaclentry (action_t action, char *c, aclent_t *ace)
*c2++ = '\0';
else if (action != Delete)
return FALSE;
else if (!(ace->a_type & ACL_DEFAULT))
return FALSE;
/* Fetch user/group id. */
if (isdigit ((unsigned char) *c))
{