diff options
Diffstat (limited to 'tests/granular/04.t')
-rw-r--r-- | tests/granular/04.t | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/tests/granular/04.t b/tests/granular/04.t index a06b0d605ebd7..fccb05c606b62 100644 --- a/tests/granular/04.t +++ b/tests/granular/04.t @@ -1,4 +1,5 @@ #!/bin/sh +# vim: filetype=sh noexpandtab ts=8 sw=8 # $FreeBSD: head/tools/regression/pjdfstest/tests/granular/04.t 211352 2010-08-15 21:24:17Z pjd $ desc="NFSv4 granular permissions checking - ACL_WRITE_OWNER" @@ -6,12 +7,11 @@ desc="NFSv4 granular permissions checking - ACL_WRITE_OWNER" dir=`dirname $0` . ${dir}/../misc.sh -[ "${os}:${fs}" = "FreeBSD:ZFS" ] || quick_exit +nfsv4acls || quick_exit -echo "1..52" +echo "1..22" n0=`namegen` -n1=`namegen` n2=`namegen` expect 0 mkdir ${n2} 0755 @@ -42,39 +42,5 @@ expect 0 -u 65534 -g 65532,65531 chown ${n0} 65534 65531 expect 65534,65531 lstat ${n0} uid,gid expect 0 unlink ${n0} -# When non-owner calls chown(2) successfully, set-uid and set-gid bits are -# removed, except when both uid and gid are equal to -1. -expect 0 create ${n0} 0644 -expect 0 prependacl ${n0} user:65534:write_owner::allow -expect 0 chmod ${n0} 06555 -expect 06555 lstat ${n0} mode -expect 0 -u 65534 -g 65533,65532 chown ${n0} 65534 65532 -expect 0555,65534,65532 lstat ${n0} mode,uid,gid -expect 0 chmod ${n0} 06555 -expect 06555 lstat ${n0} mode -expect 0 -u 65534 -g 65533,65532 chown ${n0} -1 65533 -expect 0555,65534,65533 lstat ${n0} mode,uid,gid -expect 0 chmod ${n0} 06555 -expect 06555 lstat ${n0} mode -expect 0 -u 65534 -g 65533,65532 chown ${n0} -1 -1 -expect 06555,65534,65533 lstat ${n0} mode,uid,gid -expect 0 unlink ${n0} - -expect 0 mkdir ${n0} 0755 -expect 0 prependacl ${n0} user:65534:write_owner::allow -expect 0 chmod ${n0} 06555 -expect 06555 lstat ${n0} mode -expect 0 -u 65534 -g 65533,65532 chown ${n0} 65534 65532 -expect 0555,65534,65532 lstat ${n0} mode,uid,gid -expect 0 chmod ${n0} 06555 -expect 06555 lstat ${n0} mode -expect 0 -u 65534 -g 65533,65532 chown ${n0} -1 65533 -expect 0555,65534,65533 lstat ${n0} mode,uid,gid -expect 0 chmod ${n0} 06555 -expect 06555 lstat ${n0} mode -expect 0 -u 65534 -g 65533,65532 chown ${n0} -1 -1 -expect 06555,65534,65533 lstat ${n0} mode,uid,gid -expect 0 rmdir ${n0} - cd ${cdir} expect 0 rmdir ${n2} |