summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2012-10-13 14:54:34 +0200
committerStef Walter <stefw@gnome.org>2012-10-15 14:14:58 +0200
commit2454e2d4f53472b502abcac8bab9ded03f269d62 (patch)
tree409c8295ee8acad70b629777efc4c51dc8e5a243
parenta77a12b190ccdb3004992789fbd9e18fd4417595 (diff)
downloadgnome-keyring-2454e2d4f53472b502abcac8bab9ded03f269d62.tar.gz
dbus: Don't leave unlocked keyring as consequence of changing password
* When changing the keyring for a password, we left the credential for the new password set for the keyring. This means that the keyring could be unlocked at that point. Clear it correctly. https://bugzilla.gnome.org/show_bug.cgi?id=686085
-rw-r--r--daemon/dbus/gkd-secret-change.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/daemon/dbus/gkd-secret-change.c b/daemon/dbus/gkd-secret-change.c
index 2c4ff1d0..9c7a7e97 100644
--- a/daemon/dbus/gkd-secret-change.c
+++ b/daemon/dbus/gkd-secret-change.c
@@ -512,9 +512,8 @@ cleanup:
g_object_unref (ocred);
}
if (mcred) {
- /* Destroy the master credential if failed */
- if (!result)
- gck_object_destroy (mcred, NULL, NULL);
+ /* Always destroy the master credential */
+ gck_object_destroy (mcred, NULL, NULL);
g_object_unref (mcred);
}