* setfacl.c (main): Place a single : after other and mask.

* getfacl.c (getaclentry): Allow both : and :: for other and mask.
	(main): Remove extraneous break.
This commit is contained in:
Corinna Vinschen 2002-12-15 10:09:35 +00:00
parent bd2001aec0
commit 2b3ddfcd26
3 changed files with 11 additions and 5 deletions

View File

@ -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.

View File

@ -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));

View File

@ -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);