From a3eea9c24f58325a015af6835a1543320ffcf2d9 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Fri, 3 Aug 2007 19:44:41 +0000 Subject: [PATCH] ** Fix for bug #460999 svn path=/trunk/; revision=7918 --- libedataserverui/ChangeLog | 7 +++++++ libedataserverui/e-passwords.c | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libedataserverui/ChangeLog b/libedataserverui/ChangeLog index 771f9fd..1434c17 100644 --- a/libedataserverui/ChangeLog +++ b/libedataserverui/ChangeLog @@ -1,5 +1,12 @@ 2007-08-04 Srinivasa Ragavan + ** Fix for bug #460999 + + * e-passwords.c: (ep_get_password_keyring): If the keying has null + data, consider that as invalid. + +2007-08-04 Srinivasa Ragavan + ** Fix for bug #458670 * e-name-selector-entry.c: (entry_activate): If there is no selectable diff --git a/libedataserverui/e-passwords.c b/libedataserverui/e-passwords.c index 92eb807..2e233d5 100644 --- a/libedataserverui/e-passwords.c +++ b/libedataserverui/e-passwords.c @@ -663,18 +663,20 @@ ep_get_password_keyring (EPassMsg *msg) { attr = &g_array_index (pattr, GnomeKeyringAttribute, i); - if (!strcmp(attr->name, "user")) { + if (!strcmp(attr->name, "user") && attr->value.string) { present++; if (strcmp (attr->value.string, uri->user)) accept = FALSE; - } else if (!strcmp(attr->name, "server")) { + } else if (!strcmp(attr->name, "server") && attr->value.string) { present++; if (strcmp (attr->value.string, uri->host)) accept = FALSE; } } - if (present == 2 && accept) + if (present == 2 && accept) { msg->password = g_strdup (((GnomeKeyringFound *) tmp->data)->secret); + break; + } } } } -- 2.7.4