diff options
| author | Justus Winter <[email protected]> | 2017-02-28 12:15:42 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-02-28 12:15:42 +0000 |
| commit | ebeccd73eb85f9027f0985d77dfe901266c6ddef (patch) | |
| tree | 5a6efe65b1a90f25b7ee7b33ac99857241d31afb | |
| parent | gpgscm: Track source locations in every kind of ports. (diff) | |
| download | gnupg-ebeccd73eb85f9027f0985d77dfe901266c6ddef.tar.gz gnupg-ebeccd73eb85f9027f0985d77dfe901266c6ddef.zip | |
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 <[email protected]>
| -rw-r--r-- | g10/gpg.c | 1 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 4 |
2 files changed, 5 insertions, 0 deletions
@@ -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 d1144b2c9..1840b8f32 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", |