[gnome-keyring] Bump version number to unstable version
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring] Bump version number to unstable version
- Date: Tue, 8 Jun 2010 15:52:16 +0000 (UTC)
commit ef1015c80d719e49fd8fcb1d8b2cc0a5a466b6ab
Author: Stef Walter <stef memberwebs com>
Date: Tue Jun 8 15:47:33 2010 +0000
Bump version number to unstable version
* Remove function that was specific to 2.29 and 2.30
configure.in | 2 +-
daemon/login/gkd-login.c | 31 -------------------------------
2 files changed, 1 insertions(+), 32 deletions(-)
---
diff --git a/configure.in b/configure.in
index c3c5648..a55e6a6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
AC_INIT(daemon/gkd-main.c)
-AM_INIT_AUTOMAKE(gnome-keyring, 2.30.2)
+AM_INIT_AUTOMAKE(gnome-keyring, 2.31.1)
AM_CONFIG_HEADER(config.h)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
diff --git a/daemon/login/gkd-login.c b/daemon/login/gkd-login.c
index 9031fca..93a6ac9 100644
--- a/daemon/login/gkd-login.c
+++ b/daemon/login/gkd-login.c
@@ -47,36 +47,6 @@ note_that_unlock_succeeded (void)
g_atomic_int_set (&unlock_failures, 0);
}
-#if GKR_VERSION >= 002031000
- #error "This function should be removed in 2.31.x"
-#else
-
-static void
-cleanup_security_issue_in_2_29_x_betas (const gchar *master)
-{
- gchar *password;
-
- /*
- * Remove the login password from keyring. This was a bug in 2.29.x
- * versions, and 2.30.0 (fixed in 2.30.1) which stored the master
- * password in tnhe login keyring. Try to cleanup that situation.
- */
-
- password = gkd_login_lookup_secret ("manufacturer", "Gnome Keyring",
- "serial-number", "1:USER:DEFAULT",
- NULL);
-
- if (password && g_str_equal (password, master)) {
- gkd_login_remove_secret ("manufacturer", "Gnome Keyring",
- "serial-number", "1:USER:DEFAULT",
- NULL);
- }
-
- egg_secure_strfree (password);
-}
-
-#endif /* GKR_VERSION */
-
gboolean
gkd_login_did_unlock_fail (void)
{
@@ -287,7 +257,6 @@ unlock_or_create_login (GP11Module *module, const gchar *master)
/* The unlock succeeded yay */
} else {
- cleanup_security_issue_in_2_29_x_betas (master);
note_that_unlock_succeeded ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]