diff options
| author | Gerald Thornbrugh <Gerald.Thornbrugh@Sun.COM> | 2010-02-28 15:17:54 +0000 |
|---|---|---|
| committer | Gerald Thornbrugh <Gerald.Thornbrugh@Sun.COM> | 2010-02-28 15:17:54 +0000 |
| commit | e3c57d6a57265f8b9bf3871878cf9b92213e1188 (patch) | |
| tree | 8a26228e2407aa0b3cd190c6dfbe537f95d13cac /usr/src | |
| parent | 3f2383012abdf005e860f5afa06cb2e0044a424f (diff) | |
| download | illumos-joyent-e3c57d6a57265f8b9bf3871878cf9b92213e1188.tar.gz | |
6894234 NFSv4 server ignores SGID bit when using Linux client
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/nfs/nfs4_srv.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr/src/uts/common/fs/nfs/nfs4_srv.c b/usr/src/uts/common/fs/nfs/nfs4_srv.c index 11481d7de6..668b42cc57 100644 --- a/usr/src/uts/common/fs/nfs/nfs4_srv.c +++ b/usr/src/uts/common/fs/nfs/nfs4_srv.c @@ -1630,7 +1630,7 @@ rfs4_op_create(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, } /* Get "before" change value */ - bva.va_mask = AT_CTIME|AT_SEQ; + bva.va_mask = AT_CTIME|AT_SEQ|AT_MODE; error = VOP_GETATTR(dvp, &bva, 0, cr, NULL); if (error) { *cs->statusp = resp->status = puterrno4(error); @@ -1644,14 +1644,15 @@ rfs4_op_create(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, vap = sarg.vap; /* - * Set default initial values for attributes when not specified - * in createattrs. + * Set the default initial values for attributes when the parent + * directory does not have the VSUID/VSGID bit set and they have + * not been specified in createattrs. */ - if ((vap->va_mask & AT_UID) == 0) { + if (!(bva.va_mode & VSUID) && (vap->va_mask & AT_UID) == 0) { vap->va_uid = crgetuid(cr); vap->va_mask |= AT_UID; } - if ((vap->va_mask & AT_GID) == 0) { + if (!(bva.va_mode & VSGID) && (vap->va_mask & AT_GID) == 0) { vap->va_gid = crgetgid(cr); vap->va_mask |= AT_GID; } |