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/revoke.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/revoke.c')
| -rw-r--r-- | g10/revoke.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/revoke.c b/g10/revoke.c index 0a93c31f9..0e39eca61 100644 --- a/g10/revoke.c +++ b/g10/revoke.c @@ -217,7 +217,7 @@ gen_desig_revoke (ctrl_t ctrl, const char *uname, strlist_t locusr) afx = new_armor_context (); - kdbhd = keydb_new (); + kdbhd = keydb_new (ctrl); if (!kdbhd) { rc = gpg_error_from_syserror (); @@ -641,7 +641,7 @@ gen_revoke (ctrl_t ctrl, const char *uname) } /* Search the userid; we don't want the whole getkey stuff here. */ - kdbhd = keydb_new (); + kdbhd = keydb_new (ctrl); if (!kdbhd) { rc = gpg_error_from_syserror (); |