[git] GnuPG - branch, master, updated. gnupg-2.1.5-6-geac081b

[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 GNU Privacy Guard".

The branch, master has been updated
       via  eac081ba1278855fa223b031b527498fec558bc7 (commit)
      from  15540f6233bd041b06708862a6d9535cbcabe330 (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 eac081ba1278855fa223b031b527498fec558bc7
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Jun 16 16:00:39 2015 +0200

    Don't prompt for the password multiple times in pinentry loopback mode.
    
    * g10/gpg.c (main): If OPT.PINENTRY_MODE is PINENTRY_MODE_LOOPBACK,
    clear OPT.PASSPHRASE_REPEAT.

diff --git a/g10/gpg.c b/g10/gpg.c
index 1801c87..5eae240 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3531,6 +3531,13 @@ main (int argc, char **argv)
       }
     FREE_STRLIST(nrings);
 
+    if (opt.pinentry_mode == PINENTRY_MODE_LOOPBACK)
+      /* In loopback mode, never ask for the password multiple
+	 times.  */
+      {
+	opt.passphrase_repeat = 0;
+      }
+
     if (cmd == aGPGConfTest)
       g10_exit(0);
 

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

Summary of changes:
 g10/gpg.c | 7 +++++++
 1 file changed, 7 insertions(+)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org