[Pkg-gnupg-commit] [gnupg2] 145/166: gpg, tools: Make trust-model configurable via gpgconf.

[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 ebeccd73eb85f9027f0985d77dfe901266c6ddef
Author: Justus Winter <justus at g10code.com>
Date:   Tue Feb 28 13:15:42 2017 +0100

    gpg,tools: Make trust-model configurable via gpgconf.
    
    * g10/gpg.c (gpgconf_list): Add 'trust-model'.
    * tools/gpgconf-comp.c (gc_options_gpg): Likewise.
    
    GnuPG-bug-id: 2381
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 g10/gpg.c            | 1 +
 tools/gpgconf-comp.c | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/g10/gpg.c b/g10/gpg.c
index 0c5a167..09bdf66 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1845,6 +1845,7 @@ gpgconf_list (const char *configfile)
   es_printf ("group:%lu:\n", GC_OPT_FLAG_NONE);
   es_printf ("compliance:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, "gnupg");
   es_printf ("default-new-key-algo:%lu:\n", GC_OPT_FLAG_NONE);
+  es_printf ("trust-model:%lu:\n", GC_OPT_FLAG_NONE);
 
   /* The next one is an info only item and should match the macros at
      the top of keygen.c  */
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index d1144b2..1840b8f 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -717,6 +717,10 @@ static gc_option_t gc_options_gpg[] =
      (GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_NO_CHANGE), GC_LEVEL_INVISIBLE,
      NULL, NULL,
      GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
+   { "trust-model",
+     GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
+     NULL, NULL,
+     GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
 
 
    { "Debug",

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