[gnome-keyring] Release version 2.31.91

[Stefan Walter <stefw src gnome org>]

commit 357bf1d22d5ff5120eaf843fc3818d73d53c5c91
Author: Stef Walter <stef memberwebs com>
Date:   Mon Aug 30 21:52:00 2010 +0000

    Release version 2.31.91

 NEWS                               |   13 +++++++++++++
 configure.in                       |    2 +-
 daemon/data/Makefile.am            |    2 +-
 pkcs11/wrap-layer/gkm-wrap-layer.c |    4 ++--
 4 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index 0f23972..8abfbf2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Changes in version 2.31.91 are:
+ * Fix problem with keyring names that contain foreign charaters.
+ * Build fixes and warning fixes.
+ * Better GPG Agent prompt strings.
+ * More internal documentation.
+ * Remove gconf as part of migration to gsettings.
+ * Add --replace option to daemon.
+ * Fix race condition in tests.
+ * Use new DER decoding and encoding routines.
+ * Only try to authenticate once if PKCS#11 slot has
+   protected auth path.
+ * Better handling of when PKCS#11 token is write protected.
+
 Changes in version 2.31.4 are:
  * New GPG Agent built into gnome-keyring-daemon
  * Start building (but not using) new DER parser and writer.
diff --git a/configure.in b/configure.in
index bfe1c2c..67f4cf6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(daemon/gkd-main.c)
 
-AM_INIT_AUTOMAKE(gnome-keyring, 2.31.5)
+AM_INIT_AUTOMAKE(gnome-keyring, 2.31.91)
 AM_CONFIG_HEADER(config.h)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
 
diff --git a/daemon/data/Makefile.am b/daemon/data/Makefile.am
index bc8331a..9f54cdc 100644
--- a/daemon/data/Makefile.am
+++ b/daemon/data/Makefile.am
@@ -8,5 +8,5 @@ introspect_DATA = \
 	introspect-service.xml \
 	introspect-session.xml
 
-EXTRA_DIST =
+EXTRA_DIST = \
 	$(introspect_DATA)
diff --git a/pkcs11/wrap-layer/gkm-wrap-layer.c b/pkcs11/wrap-layer/gkm-wrap-layer.c
index 21b0568..d74b0de 100644
--- a/pkcs11/wrap-layer/gkm-wrap-layer.c
+++ b/pkcs11/wrap-layer/gkm-wrap-layer.c
@@ -580,7 +580,7 @@ static CK_RV
 auth_C_InitPIN (CK_SESSION_HANDLE handle, CK_UTF8CHAR_PTR pin, CK_ULONG pin_len)
 {
 	GkmWrapPrompt *prompt;
-	CK_RV rv;
+	CK_RV rv = CKR_OK;
 
 	prompt = gkm_wrap_prompt_for_init_pin (gkm_wrap_layer_get_functions_no_prompts(),
 	                                       handle, pin, pin_len);
@@ -622,7 +622,7 @@ auth_C_SetPIN (CK_SESSION_HANDLE handle, CK_UTF8CHAR_PTR old_pin, CK_ULONG old_p
                CK_UTF8CHAR_PTR new_pin, CK_ULONG new_pin_len)
 {
 	GkmWrapPrompt *prompt;
-	CK_RV rv;
+	CK_RV rv = CKR_OK;
 
 	prompt = gkm_wrap_prompt_for_set_pin (gkm_wrap_layer_get_functions_no_prompts(),
 	                                      handle, old_pin, old_pin_len, new_pin, new_pin_len);