diff options
| author | Werner Koch <wk@gnupg.org> | 2017-10-27 13:56:15 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-10-27 13:56:15 +0200 |
| commit | f6ab97fd9620bb8f512ffb471a66e5f96098a7cc (patch) | |
| tree | 99db33d56ef4f0c05f1d6af6ec7ffaffd9547e1b /sm/gpgsm.c | |
| parent | agent: Clean up pinentry access locking. (diff) | |
| parent | agent, tests: Support --disable-scdaemon build case. (diff) | |
| download | gnupg2-f6ab97fd9620bb8f512ffb471a66e5f96098a7cc.tar.xz gnupg2-f6ab97fd9620bb8f512ffb471a66e5f96098a7cc.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Resolved Conflicts:
configure.ac - Adjust due to new log_clock otions
Diffstat (limited to 'sm/gpgsm.c')
| -rw-r--r-- | sm/gpgsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index bd701ab7f..e80de6378 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -2058,7 +2058,7 @@ main ( int argc, char **argv) ksba_cert_t cert = NULL; char *grip = NULL; - rc = gpgsm_find_cert (&ctrl, *argv, NULL, &cert); + rc = gpgsm_find_cert (&ctrl, *argv, NULL, &cert, 0); if (rc) ; else if (!(grip = gpgsm_get_keygrip_hexstring (cert))) |