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/gpgsm.h | |
| 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/gpgsm.h')
| -rw-r--r-- | sm/gpgsm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sm/gpgsm.h b/sm/gpgsm.h index 0421b97bb..3e2f95fb3 100644 --- a/sm/gpgsm.h +++ b/sm/gpgsm.h @@ -331,7 +331,7 @@ int gpgsm_add_to_certlist (ctrl_t ctrl, const char *name, int secret, certlist_t *listaddr, int is_encrypt_to); void gpgsm_release_certlist (certlist_t list); int gpgsm_find_cert (ctrl_t ctrl, const char *name, ksba_sexp_t keyid, - ksba_cert_t *r_cert); + ksba_cert_t *r_cert, int allow_ambiguous); /*-- keylist.c --*/ gpg_error_t gpgsm_list_keys (ctrl_t ctrl, strlist_t names, |