[gnome-keyring] daemon: Fix regression when an invalid password used to unlock
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring] daemon: Fix regression when an invalid password used to unlock
- Date: Wed, 18 Jan 2012 06:35:33 +0000 (UTC)
commit b080a2d397732650b67e0790bccd950423a6b89f
Author: Stef Walter <stefw collabora co uk>
Date: Wed Jan 18 07:32:46 2012 +0100
daemon: Fix regression when an invalid password used to unlock
* Fix regression which emitted an warning when an invalid password
used to unlock a keyring.
daemon/dbus/gkd-secret-error.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/daemon/dbus/gkd-secret-error.c b/daemon/dbus/gkd-secret-error.c
index e44af78..0d44d13 100644
--- a/daemon/dbus/gkd-secret-error.c
+++ b/daemon/dbus/gkd-secret-error.c
@@ -60,7 +60,8 @@ gkd_secret_propagate_error (DBusMessage *message,
g_return_val_if_fail (error != NULL, NULL);
- if (g_error_matches (error, GCK_ERROR, CKR_USER_NOT_LOGGED_IN)) {
+ if (g_error_matches (error, GCK_ERROR, CKR_USER_NOT_LOGGED_IN) ||
+ g_error_matches (error, GCK_ERROR, CKR_PIN_INCORRECT)) {
dbus_set_error (&derr, INTERNAL_ERROR_DENIED, "The password was invalid");
} else if (g_error_matches (error, GCK_ERROR, CKR_WRAPPED_KEY_INVALID) ||
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]