diff options
| author | Werner Koch <[email protected]> | 2011-01-24 11:24:11 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-01-24 11:24:11 +0000 |
| commit | c5e8a4c0fdde7f4aef2163a3710483c87bdf3161 (patch) | |
| tree | ae9da511231485f5c8ba8faeb3e7db3b971fe8ff /dirmngr/dirmngr.h | |
| parent | Fix regression introduced by "editing only change". (diff) | |
| parent | Remove keyserver/ from the build system. (diff) | |
| download | gnupg-c5e8a4c0fdde7f4aef2163a3710483c87bdf3161.tar.gz gnupg-c5e8a4c0fdde7f4aef2163a3710483c87bdf3161.zip | |
Merge branch 'master' into ECC-INTEGRATION-2-1
Diffstat (limited to 'dirmngr/dirmngr.h')
| -rw-r--r-- | dirmngr/dirmngr.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h index 01478a64f..1ba90b8ed 100644 --- a/dirmngr/dirmngr.h +++ b/dirmngr/dirmngr.h @@ -32,7 +32,7 @@ #include "../common/membuf.h" #include "../common/sysutils.h" /* (gnupg_fd_t) */ #include "../common/i18n.h" - +#include "../common/http.h" /* (parsed_uri_t) */ /* This objects keeps information about a particular LDAP server and is used as item of a single linked list of servers. */ @@ -49,6 +49,17 @@ struct ldap_server_s typedef struct ldap_server_s *ldap_server_t; +/* This objects is used to build a list of URI consisting of the + original and the parsed URI. */ +struct uri_item_s +{ + struct uri_item_s *next; + parsed_uri_t parsed_uri; /* The broken down URI. */ + char uri[1]; /* The original URI. */ +}; +typedef struct uri_item_s *uri_item_t; + + /* A list of fingerprints. */ struct fingerprint_list_s; typedef struct fingerprint_list_s *fingerprint_list_t; @@ -163,6 +174,7 @@ struct server_control_s response. */ int audit_events; /* Send audit events to client. */ + uri_item_t keyservers; /* List of keyservers. */ }; |