diff options
| author | Mark Shellenbaum <Mark.Shellenbaum@Sun.COM> | 2010-04-14 13:25:42 -0600 |
|---|---|---|
| committer | Mark Shellenbaum <Mark.Shellenbaum@Sun.COM> | 2010-04-14 13:25:42 -0600 |
| commit | 27dd1e87cd3d939264769dd4af7e6a529cde001f (patch) | |
| tree | 71be7e9b44ec87814159094591ebf5680350824a /usr/src/cmd/ls | |
| parent | 1cfa752f4e24c34133009b0f6c139127a5c461de (diff) | |
| download | illumos-joyent-27dd1e87cd3d939264769dd4af7e6a529cde001f.tar.gz | |
PSARC/2010/029 Improved ACL interoperability
6923083 ZFS/NFS/SMB ACL interoperability changes
Diffstat (limited to 'usr/src/cmd/ls')
| -rw-r--r-- | usr/src/cmd/ls/ls.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr/src/cmd/ls/ls.c b/usr/src/cmd/ls/ls.c index 5358e0e01d..a509fa1496 100644 --- a/usr/src/cmd/ls/ls.c +++ b/usr/src/cmd/ls/ls.c @@ -20,8 +20,7 @@ */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved. */ /* @@ -1677,12 +1676,13 @@ record_ancestry(char *file, struct stat *pstatb, struct lbuf *rep, #define IS_TYPE_ALLOWED(type) ((type) == ACE_ACCESS_ALLOWED_ACE_TYPE) int -grp_mask_to_mode(acl_t *acep) +grp_mask_to_mode(struct lbuf *p) { int mode = 0, seen = 0; int acecnt; int flags; ace_t *ap; + acl_t *acep = p->aclp; acecnt = acl_cnt(acep); for (ap = (ace_t *)acl_data(acep); acecnt--; ap++) { @@ -1700,7 +1700,8 @@ grp_mask_to_mode(acl_t *acep) * that will be the group mode bit. */ flags = ap->a_flags & ACE_TYPE_FLAGS; - if (flags == OWNED_GROUP || flags == ACE_EVERYONE) { + if (flags == OWNED_GROUP || (flags == ACE_IDENTIFIER_GROUP && + ap->a_who == p->lgid) || flags == ACE_EVERYONE) { if (ap->a_access_mask & ACE_READ_DATA) { if (!(seen & S_IRGRP)) { seen |= S_IRGRP; @@ -2052,7 +2053,7 @@ gstat(char *file, int argfl, struct ditem *myparent) } else if (acl_type(rep->aclp) == ACE_T) { int mode; - mode = grp_mask_to_mode(rep->aclp); + mode = grp_mask_to_mode(rep); rep->lflags &= ~S_IRWXG; rep->lflags |= mode; } |