[git] Pinentry - branch, master, updated. pinentry-0.9.2-35-g516e010

[by Neal H. Walfield]

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 "The standard pinentry collection".

The branch, master has been updated
       via  516e01049e9829020b40ddbcf387d4c5c05b1c3f (commit)
      from  6fdcad6a1f91bc769b03d2cb32f0b8001ed3ae19 (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 516e01049e9829020b40ddbcf387d4c5c05b1c3f
Author: Neal H. Walfield <neal at gnu.org>
Date:   Tue May 19 10:45:45 2015 +0200

    If there is an error message, show it and don't read from the cache.
    
    * pinentry/pinentry.c (cmd_getpin): If PINENTRY.ERROR is not NULL,
    don't read the password from the cache.

diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
index 1f57ab5..811cee4 100644
--- a/pinentry/pinentry.c
+++ b/pinentry/pinentry.c
@@ -1114,7 +1114,10 @@ cmd_getpin (ASSUAN_CONTEXT ctx, char *line)
       && pinentry.allow_external_password_cache
       && pinentry.keyinfo
       /* Only read from the cache if we haven't already tried it.  */
-      && ! pinentry.tried_password_cache)
+      && ! pinentry.tried_password_cache
+      /* If the last read resulted in an error, then don't read from
+	 the cache.  */
+      && ! pinentry.error)
     {
       char *password;
 

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

Summary of changes:
 pinentry/pinentry.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org