From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 16 May 2011 22:21:38 +0000 (+0200)
Subject: corrected message reporting.
X-Git-Tag: gnutls_2_99_2~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a03cdfff1a7007e08fb62def8086f68d71e7ce31;p=thirdparty%2Fgnutls.git

corrected message reporting.
---

diff --git a/src/p11common.c b/src/p11common.c
index 019877dd10..f91123f3d7 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)