diff options
| author | Werner Koch <[email protected]> | 2016-01-21 10:49:27 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-01-21 10:49:27 +0000 |
| commit | 09117e769a093467cb47154f36d7dda613313e33 (patch) | |
| tree | 91337ec1aa1669180aa685660caf247fef6d3fa5 /g10/import.c | |
| parent | gpg: Silence message about ignoring revoked user ids. (diff) | |
| download | gnupg-09117e769a093467cb47154f36d7dda613313e33.tar.gz gnupg-09117e769a093467cb47154f36d7dda613313e33.zip | |
gpg: Make --auto-key-retrieve work with dirmngr configured server.
* g10/call-dirmngr.c (gpg_dirmngr_ks_list): Make R_KEYSERVER optional.
* g10/keyserver.c (keyserver_any_configured): New.
(keyserver_put): Remove arg keyserver because this will always receive
opt.keyserver which is anyway used when connecting dirmngr. Do not
check opt.keyserver.
(keyserver_import_cert): Replace opt.keyserver by
keyserver_any_configured.
* g10/mainproc.c (check_sig_and_print): Ditto.
* g10/import.c (revocation_present): Ditto.
* g10/getkey.c (get_pubkey_byname): Ditto.
* g10/gpgv.c (keyserver_any_configured): Add stub.
* g10/test-stubs.c (keyserver_any_configured): Add stub.
--
The keyserver should be configured in dirmngr.conf and thus we can't
use opt.keyserver in gpg to decide whether a keyserver has been
configured.
GnuPG-bug-id: 2147
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/import.c b/g10/import.c index 8e75aa160..369be35d9 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2471,9 +2471,9 @@ revocation_present (ctrl_t ctrl, kbnode_t keyblock) char *tempkeystr=xstrdup(keystr_from_pk(pk)); /* No, so try and get it */ - if(opt.keyserver - && (opt.keyserver_options.options - & KEYSERVER_AUTO_KEY_RETRIEVE)) + if ((opt.keyserver_options.options + & KEYSERVER_AUTO_KEY_RETRIEVE) + && keyserver_any_configured (ctrl)) { log_info(_("WARNING: key %s may be revoked:" " fetching revocation key %s\n"), |