diff options
| author | Neal H. Walfield <[email protected]> | 2015-03-28 16:23:56 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2015-03-28 16:23:56 +0000 |
| commit | d4a32ae5c6e60dc342d9b19f5aa0d1f4bc89027c (patch) | |
| tree | a71895c723d1068c44015d5387cb71e206db550a /dirmngr/dirmngr.h | |
| parent | gpg: Only use the last specified keyserver. (diff) | |
| download | gnupg-neal/pending.tar.gz gnupg-neal/pending.zip | |
dirmngr: Better encapsulate the keyservers variable.neal/pending
* 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 'dirmngr/dirmngr.h')
| -rw-r--r-- | dirmngr/dirmngr.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h index 3dd16a348..320d178fd 100644 --- a/dirmngr/dirmngr.h +++ b/dirmngr/dirmngr.h @@ -1,6 +1,6 @@ /* dirmngr.h - Common definitions for the dirmngr * Copyright (C) 2002 Klarälvdalens Datakonsult AB - * Copyright (C) 2004 g10 Code GmbH + * Copyright (C) 2004, 2015 g10 Code GmbH * Copyright (C) 2014 Werner Koch * * This file is part of GnuPG. @@ -174,7 +174,6 @@ struct server_control_s response. */ int audit_events; /* Send audit events to client. */ - uri_item_t keyservers; /* List of keyservers. */ }; |