diff options
| author | Werner Koch <[email protected]> | 2015-10-05 15:52:28 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-10-05 15:52:28 +0000 |
| commit | ae471fa978589fb61ecb0f89bbfe4d43cf2d5eac (patch) | |
| tree | 3113249c540466a59232f8299ca77461f5ce5c7e /g10/call-dirmngr.h | |
| parent | dirmngr: Add option --keyserver. (diff) | |
| download | gnupg-ae471fa978589fb61ecb0f89bbfe4d43cf2d5eac.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to 'g10/call-dirmngr.h')
| -rw-r--r-- | g10/call-dirmngr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/call-dirmngr.h b/g10/call-dirmngr.h index b9b8e21a3..cdad645ad 100644 --- a/g10/call-dirmngr.h +++ b/g10/call-dirmngr.h @@ -21,6 +21,7 @@ void gpg_dirmngr_deinit_session_data (ctrl_t ctrl); +gpg_error_t gpg_dirmngr_ks_list (ctrl_t ctrl, char **r_keyserver); gpg_error_t gpg_dirmngr_ks_search (ctrl_t ctrl, const char *searchstr, gpg_error_t (*cb)(void*, int, char *), void *cb_value); |