From a842481ab5e1db3bc374f5a0f4bad072a88757a5 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Mon, 29 Dec 2008 00:41:51 +0000
Subject: [PATCH] --- yaml --- r: 123150 b: refs/heads/master c:
 eca1bf5b4fab56d2feb1572d34d59fcd92ea7df3 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/security/keys/keyctl.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5cab5164375d..03a36ce42494 100644
--- 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
index 7c72baa02f2e..6688765bd8b9 100644
--- 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) {