diff options
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/utils/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/utils/setfacl.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 553bc638e..9337fcb67 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,7 @@ +2011-04-18 Corinna Vinschen <corinna@vinschen.de> + + * setfacl.c (getaclentry): Allow extra colon in mask and other entries. + 2011-04-12 Jon TURNEY <jon.turney@dronecode.org.uk> * utils.sgml (strace): Fix a pair of exchanged lines in usage text. diff --git a/winsup/utils/setfacl.c b/winsup/utils/setfacl.c index 35689890c..d9d645d3c 100644 --- a/winsup/utils/setfacl.c +++ b/winsup/utils/setfacl.c @@ -111,7 +111,11 @@ getaclentry (action_t action, char *c, aclent_t *ace) /* 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))) - ; + { + /* Mask and other entries may contain an extra colon. */ + if (*c == ':') + ++c; + } else if (*c == ':') ++c; else if (*c) |