[gnome-keyring] [wrap-layer] Don't barf if token is write protected.



commit 1b8df106a2c7ac7554f5a4291a1acc5815cb5fb3
Author: Stef Walter <stef memberwebs com>
Date:   Sun Jul 11 23:17:57 2010 +0000

    [wrap-layer] Don't barf if token is write protected.
    
     * When storing unlock options, don't barf if token
       is write protected.

 pkcs11/wrap-layer/gkm-wrap-prompt.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/pkcs11/wrap-layer/gkm-wrap-prompt.c b/pkcs11/wrap-layer/gkm-wrap-prompt.c
index 1006254..4b80655 100644
--- a/pkcs11/wrap-layer/gkm-wrap-prompt.c
+++ b/pkcs11/wrap-layer/gkm-wrap-prompt.c
@@ -466,8 +466,9 @@ set_unlock_options_on_object (GkmWrapPrompt *self, CK_ATTRIBUTE_PTR options, CK_
 
 	rv = (self->module->C_SetAttributeValue) (self->session, self->object, &attr, 1);
 	if (rv != CKR_OK && rv != CKR_ATTRIBUTE_TYPE_INVALID) {
-		g_warning ("Couldn't set credential template for prompt: %s",
-		           gkm_util_rv_to_string (rv));
+		if (rv != CKR_TOKEN_WRITE_PROTECTED)
+			g_warning ("Couldn't set credential template for prompt: %s",
+			           gkm_util_rv_to_string (rv));
 	}
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]