diff options
| author | "Nagaraj Yedathore - Sun Microsystems - Bangalore India" <Nagaraj.Yedathore@Sun.COM> | 2009-06-18 15:30:30 +0530 |
|---|---|---|
| committer | "Nagaraj Yedathore - Sun Microsystems - Bangalore India" <Nagaraj.Yedathore@Sun.COM> | 2009-06-18 15:30:30 +0530 |
| commit | 4f28cd70acfd52fd329e3d479f5bdecdbe1d3d9e (patch) | |
| tree | 8cc4f4b3632f93007c3b4725091af0a736548f04 | |
| parent | 36b60d359f30acb8837a2d801b582ee5aa2c24f1 (diff) | |
| download | illumos-joyent-4f28cd70acfd52fd329e3d479f5bdecdbe1d3d9e.tar.gz | |
6705392 setfacl does not handle correclty default:mask and default:other
4828578 setfacl: incorrect error msg when setting mask/other on fs without acl support
| -rw-r--r-- | usr/src/cmd/setfacl/setfacl.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/usr/src/cmd/setfacl/setfacl.c b/usr/src/cmd/setfacl/setfacl.c index be815b7dfe..e9fb1896a9 100644 --- a/usr/src/cmd/setfacl/setfacl.c +++ b/usr/src/cmd/setfacl/setfacl.c @@ -19,18 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#ifndef lint -static char sccsid[] = "%Z%%M% %I% %E% SMI"; -#endif - -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -449,8 +438,10 @@ convert_to_aclent_t(char *entryp, int *cntp, aclent_t **aclpp, int mode) is_obj = ((tmpacl.a_type == USER_OBJ) || (tmpacl.a_type == GROUP_OBJ) || + (tmpacl.a_type == CLASS_OBJ) || (tmpacl.a_type == DEF_USER_OBJ) || - (tmpacl.a_type == DEF_GROUP_OBJ)); + (tmpacl.a_type == DEF_GROUP_OBJ) || + (tmpacl.a_type == DEF_OTHER_OBJ)); cur_cnt = *cntp - 1; switch (mode) { |