Attachment 73160 Details for Bug 59468 – proposed patch for 5.12.x

[patch] proposed patch for 5.12.x

0001-Only-ignore-passwords-in-gnome-keyring-if-Empathy-ha.patch (text/plain), 1.99 KB, created by Simon McVittie on 2013-01-16 17:22:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-01-16 17:22:35 UTC

Size: 1.99 KB

patch

obsolete

>From 0f2166e6a085707bf35fa945220d6ed61549476d Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 16 Jan 2013 17:15:01 +0000
>Subject: [PATCH 1/2] Only ignore passwords in gnome-keyring if Empathy has
> copied them
>
>When passwords are stored in the Parameters by MC and no
>SASLAuthentication handler is used, e.g. under Sugar, we currently
>save passwords into gnome-keyring, if enabled at compile time; so, we
>want to read them back out of gnome-keyring.
>
>This conflicts slightly with wanting to ignore passwords in gnome-keyring
>that are left over from an Empathy 3.0 schema migration that failed
>due to fd.o #42088. To avoid failure to authenticate/re-prompt if the
>password has been changed on the service side, ignore passwords that
>are going to be deleted; but to avoid breaking Sugar, don't ignore
>any other passwords we might find in gnome-keyring.
>
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59468
>---
> src/mcd-account-manager-default.c |   10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/src/mcd-account-manager-default.c b/src/mcd-account-manager-default.c
>index 2fb0300..e72f60b 100644
>--- a/src/mcd-account-manager-default.c
>+++ b/src/mcd-account-manager-default.c
>@@ -331,14 +331,14 @@ _get_secrets_from_keyring (const McpAccountStorage *self,
>                       "account", account,
>                       "param", "password",
>                       NULL);
>+
>+                  /* behave as if it had already been deleted, i.e. we never
>+                   * actually found it... */
>+                  param = NULL;
>+                  value = NULL;
>                 }
> 
>               gnome_keyring_found_list_free (empathy_items);
>-
>-              /* behave as if it had already been deleted, i.e. we never
>-               * actually found it... */
>-              param = NULL;
>-              value = NULL;
>             }
> 
>           if (param != NULL && value != NULL)
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 59468: 73150 | 73160

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.