---

yaml --- r: 123150 b: refs/heads/master c: eca1bf5 h: refs/heads/master v: v3
git-mirror · Dec 29, 2008 · a842481 · a842481
1 parent 36c1417
commit a842481
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c92ec8ae91ecf59d88c798301833d7cf83f2179
+refs/heads/master: eca1bf5b4fab56d2feb1572d34d59fcd92ea7df3
diff --git a/trunk/security/keys/keyctl.c b/trunk/security/keys/keyctl.c
@@ -838,11 +838,11 @@ static long get_instantiation_keyring(key_serial_t ringid,
 {
 	key_ref_t dkref;
 
+	*_dest_keyring = NULL;
+
 	/* just return a NULL pointer if we weren't asked to make a link */
-	if (ringid == 0) {
-		*_dest_keyring = NULL;
+	if (ringid == 0)
 		return 0;
-	}
 
 	/* if a specific keyring is nominated by ID, then use that */
 	if (ringid > 0) {