[Pkg-gnupg-commit] [gnupg2] 108/124: gpgconf: Add --enable-extended-key-format for the agent.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit d23052b04ebb0ac731aa351650c4084f080c640b
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Apr 3 16:52:37 2017 +0200

    gpgconf: Add --enable-extended-key-format for the agent.
    
    * tools/gpgconf-conf.c: Add option.
    * agent/gpg-agent.c (main) <aGPGConfList>: Add option.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 agent/gpg-agent.c    | 2 ++
 tools/gpgconf-comp.c | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 49b10c1..e23f438 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1378,6 +1378,8 @@ main (int argc, char **argv )
                  GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
       es_printf ("pinentry-timeout:%lu:0:\n",
                  GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME);
+      es_printf ("enable-extended-key-format:%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 1055212..0ef3cb4 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -503,6 +503,9 @@ static gc_option_t gc_options_gpg_agent[] =
    { "enable-putty-support", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
      "gnupg", "enable putty support",
      GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
+   { "enable-extended-key-format", GC_OPT_FLAG_RUNTIME, GC_LEVEL_INVISIBLE,
+     NULL, NULL,
+     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
 
    { "Debug",
      GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git