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/call-dirmngr.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/call-dirmngr.c')
| -rw-r--r-- | sm/call-dirmngr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c index 930194076..e94311892 100644 --- a/sm/call-dirmngr.c +++ b/sm/call-dirmngr.c @@ -415,7 +415,7 @@ inq_certificate (void *opaque, const char *line) ksba_cert_t cert; - err = gpgsm_find_cert (parm->ctrl, line, ski, &cert); + err = gpgsm_find_cert (parm->ctrl, line, ski, &cert, 1); if (err) { log_error ("certificate not found: %s\n", gpg_strerror (err)); @@ -936,7 +936,7 @@ run_command_inq_cb (void *opaque, const char *line) if (!*line) return gpg_error (GPG_ERR_ASS_PARAMETER); - err = gpgsm_find_cert (parm->ctrl, line, NULL, &cert); + err = gpgsm_find_cert (parm->ctrl, line, NULL, &cert, 1); if (err) { log_error ("certificate not found: %s\n", gpg_strerror (err)); |