Date: Wed, 19 Nov 2008 19:26:35 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 153234 for review Message-ID: <200811191926.mAJJQZdY053621@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=153234 Change 153234 by trasz@trasz_victim7 on 2008/11/19 19:26:01 Tweak regression tests to match the new ZFS. Now the ZFS passes tests, and UFS does not. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#8 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/03.t#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#3 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#8 (text+ko) ==== @@ -506,7 +506,7 @@ $ chmod 0 ddd $ setfacl -a0 owner@:r:allow,group@:w:fi:deny,group@:wx:allow ddd $ ls -ld ddd | cut -d' ' -f1 -> dr----x---+ +> dr---wx---+ $ rmdir ddd $ mkdir ddd @@ -621,7 +621,7 @@ $ getfacl -qn yyy > group:41:r-------------:------:deny > group:41:r-----a-------:------:allow -> user:42:--------------:f-i---:allow +> user:42:-----------Co-:f-i---:allow > user:42:r-x-----------:f-i---:allow > group:42:-w--D---------:------:deny > owner@:--------------:------:deny @@ -637,7 +637,7 @@ $ getfacl -qn yyy > group:41:r-------------:------:deny > group:41:r-----a-------:------:allow -> user:42:--------------:f-i---:allow +> user:42:-----------Co-:f-i---:allow > user:42:r-x-----------:f-i---:allow > group:42:-w--D---------:------:deny > owner@:rwxp----------:------:deny @@ -653,7 +653,7 @@ $ getfacl -qn yyy > group:41:--------------:------:deny > group:41:------a-------:------:allow -> user:42:--------------:f-i---:allow +> user:42:-----------Co-:f-i---:allow > user:42:r-x-----------:f-i---:allow > group:42:-w--D---------:------:deny > owner@:rwxp----------:------:deny @@ -722,14 +722,14 @@ > user:46:-----------Co-:-di---:allow > user:46:--------------:------:deny > user:46:--------------:------:allow -> user:45:--------------:f-i---:allow +> user:45:-----------Co-:f-i---:allow > user:44:-----------Co-:fdi---:allow > user:44:--------------:------:deny > user:44:--------------:------:allow > user:43:-----------Co-:-di---:allow > user:43:--------------:------:deny > user:43:--------------:------:allow -> user:42:--------------:f-i---:allow +> user:42:-----------Co-:f-i---:allow > owner@:--------------:------:deny > owner@:rwxp---A-W-Co-:------:allow > group@:-w-p----------:------:deny ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/03.t#3 (text+ko) ==== @@ -58,12 +58,12 @@ # DELETE_CHILD denies unlink on writable directory. expect 0 create ${n0} 0644 expect 0 prependacl . user:65534:delete_child::deny -expect EACCES -u 65534 -g 65534 unlink ${n0} +expect EPERM -u 65534 -g 65534 unlink ${n0} expect 0 unlink ${n0} # DELETE_CHILD denies moving file elsewhere. expect 0 create ${n0} 0644 -expect EACCES -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} +expect EPERM -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} expect 0 rename ${n0} ../${n3}/${n0} # DELETE_CHILD does not deny moving file from elsewhere @@ -73,7 +73,7 @@ # DELETE_CHILD denies moving file from elsewhere # to a writable directory overwriting local file. expect 0 create ../${n3}/${n0} 0644 -expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} +expect EPERM -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} # DELETE allowed on file allows for unlinking, no matter # what permissions on containing directory are. @@ -96,7 +96,7 @@ expect 0 create ../${n3}/${n0} 0644 expect 0 prependacl . user:65534:write_data::deny expect 0 prependacl . user:65534:delete_child::deny -expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} +expect EPERM -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} expect 0 prependacl ${n0} user:65534:delete::allow expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#3 (text+ko) ==== @@ -62,13 +62,13 @@ # DELETE_CHILD denies unlink on writable directory. expect 0 mkdir ${n0} 0755 expect 0 prependacl . user:65534:delete_child::deny -expect EACCES -u 65534 -g 65534 rmdir ${n0} +expect EPERM -u 65534 -g 65534 rmdir ${n0} expect 0 rmdir ${n0} # 35 # DELETE_CHILD denies moving directory elsewhere. expect 0 mkdir ${n0} 0777 -expect EACCES -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} +expect EPERM -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} expect 0 rename ${n0} ../${n3}/${n0} # DELETE_CHILD does not deny moving directory from elsewhere @@ -102,7 +102,7 @@ expect 0 mkdir ../${n3}/${n0} 0777 expect 0 prependacl . user:65534:write_data::deny expect 0 prependacl . user:65534:delete_child::deny -expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} +expect EPERM -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} expect 0 prependacl ${n0} user:65534:delete::allow # XXX: expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} expect 0 -u 65534 -g 65534 rename ../${n3}/${n0} ${n0}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811191926.mAJJQZdY053621>