diff options
| author | Neal H. Walfield <[email protected]> | 2015-03-28 16:23:56 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2015-03-31 09:58:41 +0000 |
| commit | 348c520040a31f5c322183c0654a34978e2baf6f (patch) | |
| tree | 2916b77e0c22088efe56d1b6a97fd2c48c695f9c /dirmngr/ks-action.h | |
| parent | gpg: Only use the last specified keyserver. (diff) | |
| download | gnupg-348c520040a31f5c322183c0654a34978e2baf6f.tar.gz gnupg-348c520040a31f5c322183c0654a34978e2baf6f.zip | |
dirmngr: Better encapsulate the keyservers variable.
* dirmngr/dirmngr.h (struct server_control_s): Move field keyservers
from here...
* dirmngr/server.c (struct server_local_s): ... to here. Update
users.
* dirmngr/ks-action.h (ks_action_resolve): Add argument keyservers.
(ks_action_search): Likewise.
(ks_action_get): Likewise.
(ks_action_put): Likewise.
* dirmngr/ks-action.c (ks_action_resolve): Add argument keyservers.
Use it instead of ctrl->keyservers.
(ks_action_search): Likewise.
(ks_action_get): Likewise.
(ks_action_put): Likewise.
--
Signed-off-by: Neal H. Walfield <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | dirmngr/ks-action.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/dirmngr/ks-action.h b/dirmngr/ks-action.h index 2def3dce1..c373bf9fd 100644 --- a/dirmngr/ks-action.h +++ b/dirmngr/ks-action.h @@ -22,11 +22,14 @@ #define DIRMNGR_KS_ACTION_H 1 gpg_error_t ks_action_help (ctrl_t ctrl, const char *url); -gpg_error_t ks_action_resolve (ctrl_t ctrl); -gpg_error_t ks_action_search (ctrl_t ctrl, strlist_t patterns, estream_t outfp); -gpg_error_t ks_action_get (ctrl_t ctrl, strlist_t patterns, estream_t outfp); +gpg_error_t ks_action_resolve (ctrl_t ctrl, uri_item_t keyservers); +gpg_error_t ks_action_search (ctrl_t ctrl, uri_item_t keyservers, + strlist_t patterns, estream_t outfp); +gpg_error_t ks_action_get (ctrl_t ctrl, uri_item_t keyservers, + strlist_t patterns, estream_t outfp); gpg_error_t ks_action_fetch (ctrl_t ctrl, const char *url, estream_t outfp); -gpg_error_t ks_action_put (ctrl_t ctrl, void *data, size_t datalen, +gpg_error_t ks_action_put (ctrl_t ctrl, uri_item_t keyservers, + void *data, size_t datalen, void *info, size_t infolen); |