diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2002-12-15 13:09:35 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2002-12-15 13:09:35 +0300 |
| commit | 2b3ddfcd268e19b5c1bc342d140c83cbde93a680 (patch) | |
| tree | 98c4661734e60ae9cfef1b76cfd1d7e74bb644c0 | |
| parent | bd2001aec07451e28c3ea5370af7b3caa867461a (diff) | |
* setfacl.c (main): Place a single : after other and mask.
* getfacl.c (getaclentry): Allow both : and :: for other and mask.
(main): Remove extraneous break.
| -rw-r--r-- | winsup/utils/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/utils/getfacl.c | 4 | ||||
| -rw-r--r-- | winsup/utils/setfacl.c | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 06e521611..9eea3ff15 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,9 @@ +2002-12-14 Pierre Humblet <pierre.humblet@ieee.org> + + * setfacl.c (main): Place a single : after other and mask. + * getfacl.c (getaclentry): Allow both : and :: for other and mask. + (main): Remove extraneous break. + 2002-11-25 Corinna Vinschen <corinna@vinschen.de> * mkpasswd.c (main): Set pw_passwd field to '*' on 9x/Me. diff --git a/winsup/utils/getfacl.c b/winsup/utils/getfacl.c index db88f65d4..ccf00727f 100644 --- a/winsup/utils/getfacl.c +++ b/winsup/utils/getfacl.c @@ -244,10 +244,10 @@ main (int argc, char **argv) printf ("group:%s:", groupname (acls[i].a_id)); break; case CLASS_OBJ: - printf ("mask::"); + printf ("mask:"); break; case OTHER_OBJ: - printf ("other::"); + printf ("other:"); break; } printf ("%s\n", permstr (acls[i].a_perm)); diff --git a/winsup/utils/setfacl.c b/winsup/utils/setfacl.c index c497bf9ee..4dffcd738 100644 --- a/winsup/utils/setfacl.c +++ b/winsup/utils/setfacl.c @@ -165,8 +165,9 @@ getaclentry (action_t action, char *c, aclent_t *ace) if (c2) c = c2 + 1; } - else if (*c++ != ':') - return FALSE; + /* FIXME: currently allow both :: and : */ + else if (*c == ':') + c++; if (action == Delete) { if ((ace->a_type & (CLASS_OBJ | OTHER_OBJ)) @@ -509,7 +510,6 @@ main (int argc, char **argv) usage (stderr); return 1; } - break; if (! getaclentries (Set, optarg, acls, &aclidx)) { fprintf (stderr, "%s: illegal acl entries\n", prog_name); |