diff options
| author | Werner Koch <[email protected]> | 2017-10-27 11:56:15 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-10-27 11:56:15 +0000 |
| commit | f6ab97fd9620bb8f512ffb471a66e5f96098a7cc (patch) | |
| tree | 99db33d56ef4f0c05f1d6af6ec7ffaffd9547e1b /sm/server.c | |
| parent | agent: Clean up pinentry access locking. (diff) | |
| parent | agent, tests: Support --disable-scdaemon build case. (diff) | |
| download | gnupg-f6ab97fd9620bb8f512ffb471a66e5f96098a7cc.tar.gz gnupg-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/server.c')
| -rw-r--r-- | sm/server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sm/server.c b/sm/server.c index 64a3add9a..568e51b17 100644 --- a/sm/server.c +++ b/sm/server.c @@ -1179,7 +1179,7 @@ cmd_passwd (assuan_context_t ctx, char *line) line = skip_options (line); - err = gpgsm_find_cert (ctrl, line, NULL, &cert); + err = gpgsm_find_cert (ctrl, line, NULL, &cert, 0); if (err) ; else if (!(grip = gpgsm_get_keygrip_hexstring (cert))) |