Blame SOURCES/gvfs-1.25.4-udisks2-Handle-libsecret-error-properly.patch
|
 |
9e08f4 |
From 5c2ac3f1ac452755df1c08480a0ee944138b42ec Mon Sep 17 00:00:00 2001
|
|
|
9e08f4 |
From: Ross Lagerwall <rosslagerwall@gmail.com>
|
|
|
9e08f4 |
Date: Mon, 22 Jun 2015 08:02:39 +0100
|
|
|
9e08f4 |
Subject: [PATCH] udisks2: Handle libsecret error properly
|
|
|
9e08f4 |
|
|
|
9e08f4 |
secret_password_clear_finish() returns whether any passwords are
|
|
|
9e08f4 |
removed, so it may return FALSE without setting error. Handle this
|
|
|
9e08f4 |
properly (in this case all we care about is that there wasn't an error).
|
|
|
9e08f4 |
|
|
|
9e08f4 |
https://bugzilla.gnome.org/show_bug.cgi?id=751038
|
|
|
9e08f4 |
---
|
|
|
9e08f4 |
monitor/udisks2/gvfsudisks2volume.c | 3 ++-
|
|
|
9e08f4 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
9e08f4 |
|
|
|
9e08f4 |
diff --git a/monitor/udisks2/gvfsudisks2volume.c b/monitor/udisks2/gvfsudisks2volume.c
|
|
|
9e08f4 |
index 5e83c2c..fac90e5 100644
|
|
|
9e08f4 |
--- a/monitor/udisks2/gvfsudisks2volume.c
|
|
|
9e08f4 |
+++ b/monitor/udisks2/gvfsudisks2volume.c
|
|
|
9e08f4 |
@@ -1119,7 +1119,8 @@ luks_delete_passphrase_cb (GObject *source,
|
|
|
9e08f4 |
MountData *data = user_data;
|
|
|
9e08f4 |
GError *error = NULL;
|
|
|
9e08f4 |
|
|
|
9e08f4 |
- if (secret_password_clear_finish (result, &error))
|
|
|
9e08f4 |
+ secret_password_clear_finish (result, &error);
|
|
|
9e08f4 |
+ if (!error)
|
|
|
9e08f4 |
{
|
|
|
9e08f4 |
/* with the bad passphrase out of the way, try again */
|
|
|
9e08f4 |
g_free (data->passphrase);
|
|
|
9e08f4 |
--
|
|
|
9e08f4 |
2.4.3
|
|
|
9e08f4 |
|