aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2013-10-31 16:24:33 +0000
committerDavid Howells <dhowells@redhat.com>2013-10-31 16:24:33 +0000
commitee7069af0231c87458e7ec445ae8036fe167c3ba (patch)
tree3609b9486aec0be609222e007be1e72951359ba8
parentb6808fddfb1e9390c719cbd7412e0f1a559564d9 (diff)
downloadkeyutils-ee7069af0231c87458e7ec445ae8036fe167c3ba.tar.gz
TEST: Fix link recursion test [try #2]
Fix the link recursion test to create the ninth keyring in the session keyring and then link it into the eighth so that we can set the permissions mask upon it (if we create it *in* the eighth keyring then we can't set the permissions mask as we don't have possessee permission due to recursion limits preventing possessee discovery). Signed-off-by: David Howells <dhowells@redhat.com>
-rw-r--r--tests/keyctl/link/recursion/runtest.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/keyctl/link/recursion/runtest.sh b/tests/keyctl/link/recursion/runtest.sh
index ab026f2..35898c3 100644
--- a/tests/keyctl/link/recursion/runtest.sh
+++ b/tests/keyctl/link/recursion/runtest.sh
@@ -101,9 +101,11 @@ expect_error EDEADLK
# create a ninth keyring in the eighth
marker "CREATE KEYRING 9"
-create_keyring "ninth" $keyring8id
+create_keyring "ninth" @s
expect_keyid keyring9id
set_key_perm $keyring9id 0x3f3f0000
+link_key $keyring9id $keyring8id
+unlink_key $keyring9id @s
# attempt to link a keyring to its great great great great great great grandchild keyring
marker "RECURSE 9"