diff options
| author | Werner Koch <wk@gnupg.org> | 2015-10-05 17:52:28 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-10-05 17:52:28 +0200 |
| commit | ae471fa978589fb61ecb0f89bbfe4d43cf2d5eac (patch) | |
| tree | 3113249c540466a59232f8299ca77461f5ce5c7e /g10/keyserver-internal.h | |
| parent | dirmngr: Add option --keyserver. (diff) | |
| download | gnupg2-ae471fa978589fb61ecb0f89bbfe4d43cf2d5eac.tar.xz gnupg2-ae471fa978589fb61ecb0f89bbfe4d43cf2d5eac.zip | |
gpg: Deprecate the --keyserver option.
* g10/keyserver.c (keyserver_refresh): Change return type to
gpg_error_t. Use gpg_dirmngr_ks_list to print the name of the
keyserver to use.
(keyserver_search): Do not print the "no keyserver" error
message. The same error is anyway returned from dirmngr.
* g10/call-dirmngr.c (ks_status_parm_s): Add field "keyword".
(ks_status_cb): Handle other status keywords.
(gpg_dirmngr_ks_list): New.
* tools/gpgconf-comp.c (gc_options_gpg): Deprecate "keyserver".
(gc_options_dirmngr): Add "Keyserver" group and "keyserver".
--
Along with the corresponding dirmngr change this option allows to
configure the keyserver only in dirmngr.conf. Existing
configurations will continue to work. However, GUIs using gpgconf
now the keyserver option under the dirmngr (aka Key Acquirer) tab
unless they are in export mode in which the keyserver option is also
show for gpg.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/keyserver-internal.h')
| -rw-r--r-- | g10/keyserver-internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h index fc1c3435d..beaa13c51 100644 --- a/g10/keyserver-internal.h +++ b/g10/keyserver-internal.h @@ -37,7 +37,7 @@ int keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len, struct keyserver_spec *keyserver); int keyserver_import_keyid (ctrl_t ctrl, u32 *keyid, struct keyserver_spec *keyserver); -int keyserver_refresh (ctrl_t ctrl, strlist_t users); +gpg_error_t keyserver_refresh (ctrl_t ctrl, strlist_t users); gpg_error_t keyserver_search (ctrl_t ctrl, strlist_t tokens); int keyserver_fetch (ctrl_t ctrl, strlist_t urilist); int keyserver_import_cert (ctrl_t ctrl, const char *name, |