diff options
| author | Werner Koch <wk@gnupg.org> | 2017-12-18 16:38:02 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-12-18 16:42:59 +0100 |
| commit | c817e750283278e7e8317c1b47981e71ddcc9dbf (patch) | |
| tree | 0865a55b588243ac2883c483959ec483c4c2e9ae /sm | |
| parent | po: Update Japanese translation. (diff) | |
| parent | gpgconf: Show --compliance in expert mode. (diff) | |
| download | gnupg2-c817e750283278e7e8317c1b47981e71ddcc9dbf.tar.xz gnupg2-c817e750283278e7e8317c1b47981e71ddcc9dbf.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/gpgsm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index e80de6378..650b13030 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1456,6 +1456,7 @@ main ( int argc, char **argv) { struct gnupg_compliance_option compliance_options[] = { + { "gnupg", CO_GNUPG }, { "de-vs", CO_DE_VS } }; int compliance = gnupg_parse_compliance_option (pargs.r.ret_str, |