diff options
| author | Werner Koch <[email protected]> | 2019-09-27 13:44:23 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-09-27 13:44:23 +0000 |
| commit | 9698761933f7ade732178b45df2a8763e5801763 (patch) | |
| tree | 5454a013e219a64dfd0feaf701285a65b7cfa431 /g10/keyserver.c | |
| parent | build: Build gpg-pair-tool only when there is newer libgcrypt. (diff) | |
| parent | kbx: Fix error code return in keyboxd. (diff) | |
| download | gnupg-9698761933f7ade732178b45df2a8763e5801763.tar.gz gnupg-9698761933f7ade732178b45df2a8763e5801763.zip | |
Merge branch 'switch-to-gpgk' into master
--
Resolved Conflicts:
* common/asshelp.c: Keep the new code in master for spawing under
Windows.
* g10/Makefile.am: Keep all new file.
* g10/photoid.c: Pass CTRL to pct_expando.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/keyserver.c')
| -rw-r--r-- | g10/keyserver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index c63f61c30..c2e304f09 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -1195,7 +1195,7 @@ keyidlist (ctrl_t ctrl, strlist_t users, KEYDB_SEARCH_DESC **klist, *klist=xmalloc(sizeof(KEYDB_SEARCH_DESC)*num); - kdbhd = keydb_new (); + kdbhd = keydb_new (ctrl); if (!kdbhd) { rc = gpg_error_from_syserror (); |