diff --git a/tests/generic/673 b/tests/generic/673 index 6d1f49ea8074b3cc03ccfba512e0fa024d555026..ac8b8c09fa5bc812a160839e8d4d27d4e7ab52f0 100755 --- a/tests/generic/673 +++ b/tests/generic/673 @@ -102,26 +102,14 @@ setup_testfile chmod a+rwxs $SCRATCH_MNT/a commit_and_check -#Commit to a non-exec file by an unprivileged user leaves sgid. -echo "Test 9 - qa_user, non-exec file, only sgid" -setup_testfile -chmod a+rw,g+rws $SCRATCH_MNT/a -commit_and_check "$qa_user" - #Commit to a group-exec file by an unprivileged user clears sgid -echo "Test 10 - qa_user, group-exec file, only sgid" +echo "Test 9 - qa_user, group-exec file, only sgid" setup_testfile chmod a+rw,g+rwxs $SCRATCH_MNT/a commit_and_check "$qa_user" -#Commit to a user-exec file by an unprivileged user clears sgid -echo "Test 11 - qa_user, user-exec file, only sgid" -setup_testfile -chmod a+rw,u+x,g+rws $SCRATCH_MNT/a -commit_and_check "$qa_user" - #Commit to a all-exec file by an unprivileged user clears sgid. -echo "Test 12 - qa_user, all-exec file, only sgid" +echo "Test 10 - qa_user, all-exec file, only sgid" setup_testfile chmod a+rwx,g+rwxs $SCRATCH_MNT/a commit_and_check "$qa_user" diff --git a/tests/generic/673.out b/tests/generic/673.out index 0817857d68c6c61b10b1e1333049f2fb88ab350f..4276fa016a099c7df70b855fd574837665d8368a 100644 --- a/tests/generic/673.out +++ b/tests/generic/673.out @@ -47,25 +47,13 @@ Test 8 - root, all-exec file 3784de23efab7a2074c9ec66901e39e5 SCRATCH_MNT/a 6777 -rwsrwsrwx SCRATCH_MNT/a -Test 9 - qa_user, non-exec file, only sgid -310f146ce52077fcd3308dcbe7632bb2 SCRATCH_MNT/a -2666 -rw-rwSrw- SCRATCH_MNT/a -3784de23efab7a2074c9ec66901e39e5 SCRATCH_MNT/a -2666 -rw-rwSrw- SCRATCH_MNT/a - -Test 10 - qa_user, group-exec file, only sgid +Test 9 - qa_user, group-exec file, only sgid 310f146ce52077fcd3308dcbe7632bb2 SCRATCH_MNT/a 2676 -rw-rwsrw- SCRATCH_MNT/a 3784de23efab7a2074c9ec66901e39e5 SCRATCH_MNT/a 676 -rw-rwxrw- SCRATCH_MNT/a -Test 11 - qa_user, user-exec file, only sgid -310f146ce52077fcd3308dcbe7632bb2 SCRATCH_MNT/a -2766 -rwxrwSrw- SCRATCH_MNT/a -3784de23efab7a2074c9ec66901e39e5 SCRATCH_MNT/a -2766 -rwxrwSrw- SCRATCH_MNT/a - -Test 12 - qa_user, all-exec file, only sgid +Test 10 - qa_user, all-exec file, only sgid 310f146ce52077fcd3308dcbe7632bb2 SCRATCH_MNT/a 2777 -rwxrwsrwx SCRATCH_MNT/a 3784de23efab7a2074c9ec66901e39e5 SCRATCH_MNT/a diff --git a/tests/generic/683 b/tests/generic/683 index 302f8bb21b5da22e0478a08e70e582f5ec694663..994d7869666a049827198a6bff348c11f5b21d91 100755 --- a/tests/generic/683 +++ b/tests/generic/683 @@ -110,26 +110,14 @@ setup_testfile chmod a+rwxs $junk_file commit_and_check "" "$verb" 64k 64k -# Commit to a non-exec file by an unprivileged user leaves sgid. -echo "Test 9 - qa_user, non-exec file $verb, only sgid" -setup_testfile -chmod a+rw,g+rws $junk_file -commit_and_check "$qa_user" "$verb" 64k 64k - # Commit to a group-exec file by an unprivileged user clears sgid -echo "Test 10 - qa_user, group-exec file $verb, only sgid" +echo "Test 9 - qa_user, group-exec file $verb, only sgid" setup_testfile chmod a+rw,g+rwxs $junk_file commit_and_check "$qa_user" "$verb" 64k 64k -# Commit to a user-exec file by an unprivileged user clears sgid -echo "Test 11 - qa_user, user-exec file $verb, only sgid" -setup_testfile -chmod a+rw,u+x,g+rws $junk_file -commit_and_check "$qa_user" "$verb" 64k 64k - # Commit to a all-exec file by an unprivileged user clears sgid. -echo "Test 12 - qa_user, all-exec file $verb, only sgid" +echo "Test 10 - qa_user, all-exec file $verb, only sgid" setup_testfile chmod a+rwx,g+rwxs $junk_file commit_and_check "$qa_user" "$verb" 64k 64k diff --git a/tests/generic/683.out b/tests/generic/683.out index ca29f6e6760e67db735170355d0039bf42413b0d..de18ea5f64c4cdb87d8edd83dcc7b56ab7ac9369 100644 --- a/tests/generic/683.out +++ b/tests/generic/683.out @@ -31,19 +31,11 @@ Test 8 - root, all-exec file falloc 6777 -rwsrwsrwx TEST_DIR/683/a 6777 -rwsrwsrwx TEST_DIR/683/a -Test 9 - qa_user, non-exec file falloc, only sgid -2666 -rw-rwSrw- TEST_DIR/683/a -2666 -rw-rwSrw- TEST_DIR/683/a - -Test 10 - qa_user, group-exec file falloc, only sgid +Test 9 - qa_user, group-exec file falloc, only sgid 2676 -rw-rwsrw- TEST_DIR/683/a 676 -rw-rwxrw- TEST_DIR/683/a -Test 11 - qa_user, user-exec file falloc, only sgid -2766 -rwxrwSrw- TEST_DIR/683/a -2766 -rwxrwSrw- TEST_DIR/683/a - -Test 12 - qa_user, all-exec file falloc, only sgid +Test 10 - qa_user, all-exec file falloc, only sgid 2777 -rwxrwsrwx TEST_DIR/683/a 777 -rwxrwxrwx TEST_DIR/683/a diff --git a/tests/generic/684 b/tests/generic/684 index 19ccb22858c4c4b6abdd5a635bdc535633a0c310..46341c6416802f2b4f96ee54753f95eae1a9cb16 100755 --- a/tests/generic/684 +++ b/tests/generic/684 @@ -110,26 +110,14 @@ setup_testfile chmod a+rwxs $junk_file commit_and_check "" "$verb" 64k 64k -# Commit to a non-exec file by an unprivileged user leaves sgid. -echo "Test 9 - qa_user, non-exec file $verb, only sgid" -setup_testfile -chmod a+rw,g+rws $junk_file -commit_and_check "$qa_user" "$verb" 64k 64k - # Commit to a group-exec file by an unprivileged user clears sgid -echo "Test 10 - qa_user, group-exec file $verb, only sgid" +echo "Test 9 - qa_user, group-exec file $verb, only sgid" setup_testfile chmod a+rw,g+rwxs $junk_file commit_and_check "$qa_user" "$verb" 64k 64k -# Commit to a user-exec file by an unprivileged user clears sgid -echo "Test 11 - qa_user, user-exec file $verb, only sgid" -setup_testfile -chmod a+rw,u+x,g+rws $junk_file -commit_and_check "$qa_user" "$verb" 64k 64k - # Commit to a all-exec file by an unprivileged user clears sgid. -echo "Test 12 - qa_user, all-exec file $verb, only sgid" +echo "Test 10 - qa_user, all-exec file $verb, only sgid" setup_testfile chmod a+rwx,g+rwxs $junk_file commit_and_check "$qa_user" "$verb" 64k 64k diff --git a/tests/generic/684.out b/tests/generic/684.out index 2e084ceda4f191a12b533ad4d0732a20ba014b51..da5ada5e8a2d6ffddb39b71ae1025462d07d4649 100644 --- a/tests/generic/684.out +++ b/tests/generic/684.out @@ -31,19 +31,11 @@ Test 8 - root, all-exec file fpunch 6777 -rwsrwsrwx TEST_DIR/684/a 6777 -rwsrwsrwx TEST_DIR/684/a -Test 9 - qa_user, non-exec file fpunch, only sgid -2666 -rw-rwSrw- TEST_DIR/684/a -2666 -rw-rwSrw- TEST_DIR/684/a - -Test 10 - qa_user, group-exec file fpunch, only sgid +Test 9 - qa_user, group-exec file fpunch, only sgid 2676 -rw-rwsrw- TEST_DIR/684/a 676 -rw-rwxrw- TEST_DIR/684/a -Test 11 - qa_user, user-exec file fpunch, only sgid -2766 -rwxrwSrw- TEST_DIR/684/a -2766 -rwxrwSrw- TEST_DIR/684/a - -Test 12 - qa_user, all-exec file fpunch, only sgid +Test 10 - qa_user, all-exec file fpunch, only sgid 2777 -rwxrwsrwx TEST_DIR/684/a 777 -rwxrwxrwx TEST_DIR/684/a diff --git a/tests/generic/685 b/tests/generic/685 index a58eccdafe8a620b2b323a506a03374e91070435..dfe27ade5a341505ac0cd6a8c6b9d4c2ec425928 100755 --- a/tests/generic/685 +++ b/tests/generic/685 @@ -110,26 +110,14 @@ setup_testfile chmod a+rwxs $junk_file commit_and_check "" "$verb" 64k 64k -# Commit to a non-exec file by an unprivileged user leaves sgid. -echo "Test 9 - qa_user, non-exec file $verb, only sgid" -setup_testfile -chmod a+rw,g+rws $junk_file -commit_and_check "$qa_user" "$verb" 64k 64k - # Commit to a group-exec file by an unprivileged user clears sgid -echo "Test 10 - qa_user, group-exec file $verb, only sgid" +echo "Test 9 - qa_user, group-exec file $verb, only sgid" setup_testfile chmod a+rw,g+rwxs $junk_file commit_and_check "$qa_user" "$verb" 64k 64k -# Commit to a user-exec file by an unprivileged user clears sgid -echo "Test 11 - qa_user, user-exec file $verb, only sgid" -setup_testfile -chmod a+rw,u+x,g+rws $junk_file -commit_and_check "$qa_user" "$verb" 64k 64k - # Commit to a all-exec file by an unprivileged user clears sgid. -echo "Test 12 - qa_user, all-exec file $verb, only sgid" +echo "Test 10 - qa_user, all-exec file $verb, only sgid" setup_testfile chmod a+rwx,g+rwxs $junk_file commit_and_check "$qa_user" "$verb" 64k 64k diff --git a/tests/generic/685.out b/tests/generic/685.out index e611da3e9c8580146a455aff5167af8b75e2c369..03eef362ee6d46aec72f77f31830114583a52883 100644 --- a/tests/generic/685.out +++ b/tests/generic/685.out @@ -31,19 +31,11 @@ Test 8 - root, all-exec file fzero 6777 -rwsrwsrwx TEST_DIR/685/a 6777 -rwsrwsrwx TEST_DIR/685/a -Test 9 - qa_user, non-exec file fzero, only sgid -2666 -rw-rwSrw- TEST_DIR/685/a -2666 -rw-rwSrw- TEST_DIR/685/a - -Test 10 - qa_user, group-exec file fzero, only sgid +Test 9 - qa_user, group-exec file fzero, only sgid 2676 -rw-rwsrw- TEST_DIR/685/a 676 -rw-rwxrw- TEST_DIR/685/a -Test 11 - qa_user, user-exec file fzero, only sgid -2766 -rwxrwSrw- TEST_DIR/685/a -2766 -rwxrwSrw- TEST_DIR/685/a - -Test 12 - qa_user, all-exec file fzero, only sgid +Test 10 - qa_user, all-exec file fzero, only sgid 2777 -rwxrwsrwx TEST_DIR/685/a 777 -rwxrwxrwx TEST_DIR/685/a diff --git a/tests/generic/686 b/tests/generic/686 index ef9ea47afb69d7c1d1e2e3799e68b21476c9dc4b..1d8129098f0bff367009b446079942061da862b2 100755 --- a/tests/generic/686 +++ b/tests/generic/686 @@ -110,26 +110,14 @@ setup_testfile chmod a+rwxs $junk_file commit_and_check "" "$verb" 64k 64k -# Commit to a non-exec file by an unprivileged user leaves sgid. -echo "Test 9 - qa_user, non-exec file $verb, only sgid" -setup_testfile -chmod a+rw,g+rws $junk_file -commit_and_check "$qa_user" "$verb" 64k 64k - # Commit to a group-exec file by an unprivileged user clears sgid -echo "Test 10 - qa_user, group-exec file $verb, only sgid" +echo "Test 9 - qa_user, group-exec file $verb, only sgid" setup_testfile chmod a+rw,g+rwxs $junk_file commit_and_check "$qa_user" "$verb" 64k 64k -# Commit to a user-exec file by an unprivileged user clears sgid -echo "Test 11 - qa_user, user-exec file $verb, only sgid" -setup_testfile -chmod a+rw,u+x,g+rws $junk_file -commit_and_check "$qa_user" "$verb" 64k 64k - # Commit to a all-exec file by an unprivileged user clears sgid. -echo "Test 12 - qa_user, all-exec file $verb, only sgid" +echo "Test 10 - qa_user, all-exec file $verb, only sgid" setup_testfile chmod a+rwx,g+rwxs $junk_file commit_and_check "$qa_user" "$verb" 64k 64k diff --git a/tests/generic/686.out b/tests/generic/686.out index aa1e64715dde715c98e03e5035ad1d8116025911..562e1ab98495f55f482db07d47e91ece2a984661 100644 --- a/tests/generic/686.out +++ b/tests/generic/686.out @@ -31,19 +31,11 @@ Test 8 - root, all-exec file finsert 6777 -rwsrwsrwx TEST_DIR/686/a 6777 -rwsrwsrwx TEST_DIR/686/a -Test 9 - qa_user, non-exec file finsert, only sgid -2666 -rw-rwSrw- TEST_DIR/686/a -2666 -rw-rwSrw- TEST_DIR/686/a - -Test 10 - qa_user, group-exec file finsert, only sgid +Test 9 - qa_user, group-exec file finsert, only sgid 2676 -rw-rwsrw- TEST_DIR/686/a 676 -rw-rwxrw- TEST_DIR/686/a -Test 11 - qa_user, user-exec file finsert, only sgid -2766 -rwxrwSrw- TEST_DIR/686/a -2766 -rwxrwSrw- TEST_DIR/686/a - -Test 12 - qa_user, all-exec file finsert, only sgid +Test 10 - qa_user, all-exec file finsert, only sgid 2777 -rwxrwsrwx TEST_DIR/686/a 777 -rwxrwxrwx TEST_DIR/686/a diff --git a/tests/generic/687 b/tests/generic/687 index f4a1c1bb42356877dc764ffb4403f5f766ce5066..b29523788ff082322838f4f7a91d7084f2bba1ae 100755 --- a/tests/generic/687 +++ b/tests/generic/687 @@ -110,26 +110,14 @@ setup_testfile chmod a+rwxs $junk_file commit_and_check "" "$verb" 64k 64k -# Commit to a non-exec file by an unprivileged user leaves sgid. -echo "Test 9 - qa_user, non-exec file $verb, only sgid" -setup_testfile -chmod a+rw,g+rws $junk_file -commit_and_check "$qa_user" "$verb" 64k 64k - # Commit to a group-exec file by an unprivileged user clears sgid -echo "Test 10 - qa_user, group-exec file $verb, only sgid" +echo "Test 9 - qa_user, group-exec file $verb, only sgid" setup_testfile chmod a+rw,g+rwxs $junk_file commit_and_check "$qa_user" "$verb" 64k 64k -# Commit to a user-exec file by an unprivileged user clears sgid -echo "Test 11 - qa_user, user-exec file $verb, only sgid" -setup_testfile -chmod a+rw,u+x,g+rws $junk_file -commit_and_check "$qa_user" "$verb" 64k 64k - # Commit to a all-exec file by an unprivileged user clears sgid. -echo "Test 12 - qa_user, all-exec file $verb, only sgid" +echo "Test 10 - qa_user, all-exec file $verb, only sgid" setup_testfile chmod a+rwx,g+rwxs $junk_file commit_and_check "$qa_user" "$verb" 64k 64k diff --git a/tests/generic/687.out b/tests/generic/687.out index c5116c2794220ac89ebd44c142725e5ebb0b8196..f72f6d30f33b87f30900ebc7cd3feb5cb207e1d8 100644 --- a/tests/generic/687.out +++ b/tests/generic/687.out @@ -31,19 +31,11 @@ Test 8 - root, all-exec file fcollapse 6777 -rwsrwsrwx TEST_DIR/687/a 6777 -rwsrwsrwx TEST_DIR/687/a -Test 9 - qa_user, non-exec file fcollapse, only sgid -2666 -rw-rwSrw- TEST_DIR/687/a -2666 -rw-rwSrw- TEST_DIR/687/a - -Test 10 - qa_user, group-exec file fcollapse, only sgid +Test 9 - qa_user, group-exec file fcollapse, only sgid 2676 -rw-rwsrw- TEST_DIR/687/a 676 -rw-rwxrw- TEST_DIR/687/a -Test 11 - qa_user, user-exec file fcollapse, only sgid -2766 -rwxrwSrw- TEST_DIR/687/a -2766 -rwxrwSrw- TEST_DIR/687/a - -Test 12 - qa_user, all-exec file fcollapse, only sgid +Test 10 - qa_user, all-exec file fcollapse, only sgid 2777 -rwxrwsrwx TEST_DIR/687/a 777 -rwxrwxrwx TEST_DIR/687/a