diff options
author | Werner Koch <[email protected]> | 2017-12-18 15:38:02 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2017-12-18 15:42:59 +0000 |
commit | c817e750283278e7e8317c1b47981e71ddcc9dbf (patch) | |
tree | 0865a55b588243ac2883c483959ec483c4c2e9ae /tools/gpgconf-comp.c | |
parent | po: Update Japanese translation. (diff) | |
parent | gpgconf: Show --compliance in expert mode. (diff) | |
download | gnupg-c817e750283278e7e8317c1b47981e71ddcc9dbf.tar.gz gnupg-c817e750283278e7e8317c1b47981e71ddcc9dbf.zip |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'tools/gpgconf-comp.c')
-rw-r--r-- | tools/gpgconf-comp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index bf54303d6..c799143cd 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -714,7 +714,7 @@ static gc_option_t gc_options_gpg[] = { "options", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE, NULL, NULL, GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG }, - { "compliance", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE, + { "compliance", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT, NULL, NULL, GC_ARG_TYPE_STRING, GC_BACKEND_GPG }, { "default-new-key-algo", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE, @@ -833,6 +833,9 @@ static gc_option_t gc_options_gpgsm[] = (GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_NO_CHANGE), GC_LEVEL_INVISIBLE, NULL, NULL, GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM }, + { "compliance", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT, + NULL, NULL, + GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM }, { "Debug", GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED, |