[git] GnuPG - branch, master, updated. gnupg-2.1.1-20-gac2cb47

[by Werner Koch]

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  ac2cb47fc5c0be539aaa07fd141acdbc0934800f (commit)
       via  cf88337f8a4f8c98aca4b1da5921d18567b4f474 (commit)
      from  d2d8481e3866124c143cac165dea8453001e2905 (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 ac2cb47fc5c0be539aaa07fd141acdbc0934800f
Author: Werner Koch <wk at gnupg.org>
Date:   Sun Jan 4 17:19:06 2015 +0100

    agent: Make --allow-loopback-pinentry gpgconf changeable.

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 918c72b..fe310f4 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -205,7 +205,7 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oAllowPresetPassphrase, "allow-preset-passphrase",
                 /* */                    N_("allow presetting passphrase")),
   ARGPARSE_s_n (oAllowLoopbackPinentry, "allow-loopback-pinentry",
-                                        N_("allow presetting passphrase")),
+                                   N_("allow caller to override the pinentry")),
   ARGPARSE_s_n (oSSHSupport,   "enable-ssh-support", N_("enable ssh support")),
   ARGPARSE_s_n (oPuttySupport, "enable-putty-support",
 #ifdef HAVE_W32_SYSTEM
@@ -1060,6 +1060,8 @@ main (int argc, char **argv )
 #else
       es_printf ("enable-ssh-support:%lu:\n", GC_OPT_FLAG_NONE);
 #endif
+      es_printf ("allow-loopback-pinentry:%lu:\n",
+                 GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
 
       agent_exit (0);
     }
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 61faa1d..86e67eb 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -542,6 +542,9 @@ static gc_option_t gc_options_gpg_agent[] =
    { "no-allow-mark-trusted", GC_OPT_FLAG_RUNTIME,
      GC_LEVEL_ADVANCED, "gnupg", "disallow clients to mark keys as \"trusted\"",
      GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
+   { "allow-loopback-pinentry", GC_OPT_FLAG_RUNTIME,
+     GC_LEVEL_EXPERT, "gnupg", "allow caller to override the pinentry",
+     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
    { "no-grab", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
      "gnupg", "do not grab keyboard and mouse",
      GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },

commit cf88337f8a4f8c98aca4b1da5921d18567b4f474
Author: Joshua Rogers <git at internot.info>
Date:   Tue Dec 23 00:47:50 2014 +1100

    tools: Free variable before return
    
    * tools/gpgconf-comp.c: Free 'dest_filename' before it is returned
    upon error.
    --
    
    Signed-off-by: Joshua Rogers <git at internot.info>

diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 8c47b2e..61faa1d 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -2508,7 +2508,10 @@ change_options_file (gc_component_t component, gc_backend_t backend,
   res = link (dest_filename, orig_filename);
 #endif
   if (res < 0 && errno != ENOENT)
-    return -1;
+    {
+      xfree (dest_filename);
+      return -1;
+    }
   if (res < 0)
     {
       xfree (orig_filename);

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

Summary of changes:
 agent/gpg-agent.c    |    4 +++-
 tools/gpgconf-comp.c |    8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)


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