[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_5-4-gc0e2cf2

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=c0e2cf2de3d254fc4bb85586b2cee7ab0c4b6357

The branch, gnutls_2_12_x has been updated
       via  c0e2cf2de3d254fc4bb85586b2cee7ab0c4b6357 (commit)
      from  b0dc5a5b0988fe151027e039d96bc57bd6d3fa87 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c0e2cf2de3d254fc4bb85586b2cee7ab0c4b6357
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue May 17 00:21:38 2011 +0200

    corrected message reporting.

-----------------------------------------------------------------------

Summary of changes:
 src/p11common.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/p11common.c b/src/p11common.c
index 019877d..f91123f 100644
--- a/src/p11common.c
+++ b/src/p11common.c
@@ -41,7 +41,17 @@ pin_callback (void *user, int attempt, const char *token_url,
   static char *cached_url = NULL;
   static char cached_pin[32] = "";
 
-
+  if (flags & GNUTLS_PKCS11_PIN_FINAL_TRY)
+    {
+      cache = 0;
+      printf ("*** This is the final try before locking!\n");
+    }
+  if (flags & GNUTLS_PKCS11_PIN_COUNT_LOW)
+    {
+      cache = 0;
+      printf ("*** Only few tries left before locking!\n");
+    }
+    
   if (cache == 1 && cached_url != NULL)
     {
       if (strcmp (cached_url, token_url) == 0)
@@ -59,16 +69,6 @@ pin_callback (void *user, int attempt, const char *token_url,
 
   printf ("PIN required for token '%s' with URL '%s'\n", token_label,
           token_url);
-  if (flags & GNUTLS_PKCS11_PIN_FINAL_TRY)
-    {
-      cache = 0;
-      printf ("*** This is the final try before locking!\n");
-    }
-  if (flags & GNUTLS_PKCS11_PIN_COUNT_LOW)
-    {
-      cache = 0;
-      printf ("*** Only few tries left before locking!\n");
-    }
 
   password = getpass ("Enter pin: ");
   if (password == NULL || password[0] == 0)


hooks/post-receive
-- 
GNU gnutls