diff options
author | Werner Koch <wk@gnupg.org> | 2019-09-09 14:34:09 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2019-09-09 15:01:47 +0200 |
commit | aba82684fe14289cf62b4694bc398f3a274b4762 (patch) | |
tree | b66c13bcb29f62f64c4aaa603d510b0fd65cb7cc /g10/revoke.c | |
parent | kbx: Fix keyboxd search first. (diff) | |
download | gnupg2-aba82684fe14289cf62b4694bc398f3a274b4762.tar.xz gnupg2-aba82684fe14289cf62b4694bc398f3a274b4762.zip |
gpg: New option --use-keyboxd.
* g10/gpg.c (oUseKeyboxd,oKeyboxdProgram): New consts.
(opts): New options --use-keyboxd and --keyboxd-program.
(main): Implement them.
* g10/keydb.c: Move some defs out to ...
* g10/keydb-private.h: new file.
* g10/keydb.c: prefix function names with "internal" and move original
functions to ...
* g10/call-keyboxd.c: new file. Divert to the internal fucntion if
--use-keyboxd is used. Add a CTRL arg to most fucntions and change
all callers.
* g10/Makefile.am (common_source): Add new files.
(noinst_PROGRAMS): Do bot build gpgcompose.
--
Note that this is just the framework with only a basic implementation
of searching via keyboxd.
Signed-off-by: Werner Koch <wk@gnupg.org>
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 (); |