diff options
Diffstat (limited to 'tests/keyctl/grant/valid2/runtest.sh')
| -rw-r--r-- | tests/keyctl/grant/valid2/runtest.sh | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/tests/keyctl/grant/valid2/runtest.sh b/tests/keyctl/grant/valid2/runtest.sh index 51091be..1fc6bfa 100644 --- a/tests/keyctl/grant/valid2/runtest.sh +++ b/tests/keyctl/grant/valid2/runtest.sh @@ -17,14 +17,12 @@ echo "++++ BEGINNING TEST" >$OUTPUTFILE # create a keyring and attach it to the session keyring marker "ADD KEYRING" -create_keyring wibble @s -expect_keyid keyringid +create_keyring --new=keyringid wibble @s # Create a keyring and remove most permissions from it; leaving just # setsec for the owner. marker "ADD KEYRING" -create_keyring lizard $keyringid -expect_keyid keyid +create_keyring --new=keyid lizard $keyringid marker "REMOVE PERMITS" grant_key_permit $keyid own S grant_key_permit $keyid pos 0 @@ -56,8 +54,7 @@ marker "TEST WRITE" create_key --fail user lizard gizzard $keyid expect_error EACCES grant_key_permit $keyid all w -create_key user lizard gizzard $keyid -expect_keyid keyid2 +create_key --new=keyid2 user lizard gizzard $keyid grant_key_permit $keyid all 0 unlink_key --fail $keyid $keyid2 expect_error EACCES @@ -69,7 +66,7 @@ marker "TEST SEARCH" search_for_key --fail $keyid user lizard expect_error EACCES grant_key_permit $keyid pos s -search_for_key $keyid user lizard +search_for_key --expect=$keyid2 $keyid user lizard grant_key_permit $keyid pos 0 search_for_key --fail $keyid user lizard expect_error EACCES @@ -78,7 +75,7 @@ marker "TEST SEARCH 2" search_for_key --fail @s user lizard expect_error ENOKEY grant_key_permit $keyid pos s -search_for_key @s user lizard +search_for_key --expect=$keyid2 @s user lizard grant_key_permit $keyid pos 0 search_for_key --fail @s user lizard expect_error ENOKEY @@ -132,8 +129,7 @@ expect_error ENOKEY # Create a keyring and remove most permissions from it; leaving just # setsec for the owner. marker "ADD KEYRING 2" -create_keyring lizard $keyringid -expect_keyid keyid +create_keyring --new=keyid lizard $keyringid marker "REMOVE PERMITS 2" grant_key_permit $keyid own S grant_key_permit $keyid pos 0 @@ -154,8 +150,7 @@ expect_error EKEYREVOKED # Create a keyring and remove most permissions from it; leaving just # setsec for the owner. marker "ADD KEYRING 3" -create_keyring lizard $keyringid -expect_keyid keyid +create_keyring --new=keyid lizard $keyringid marker "REMOVE PERMITS 3" grant_key_permit $keyid all Sv grant_key_permit $keyid own 0 |