From 348c520040a31f5c322183c0654a34978e2baf6f Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Sat, 28 Mar 2015 17:23:56 +0100 Subject: 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 --- dirmngr/dirmngr.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dirmngr/dirmngr.h') 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. */ }; -- cgit v1.2.3