diff options
| author | Werner Koch <wk@gnupg.org> | 2017-01-09 10:11:20 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-01-09 10:28:25 +0100 |
| commit | c2cbe2f87c480c62239dc4c2cbb352acd98cd267 (patch) | |
| tree | 6b2e6e8c91a189e8dcd8c9aad6df5255f006a326 /dirmngr/http.h | |
| parent | doc: Update man page for watchgnupg (diff) | |
| download | gnupg2-c2cbe2f87c480c62239dc4c2cbb352acd98cd267.tar.xz gnupg2-c2cbe2f87c480c62239dc4c2cbb352acd98cd267.zip | |
dirmngr: Do not use a SRV record for HKP if a port was specified.
* dirmngr/http.h (parsed_uri_s): Add field EXPLICIT_PORT.
* dirmngr/http.c (do_parse_uri): That it.
* dirmngr/ks-engine-hkp.c (map_host): Add arg NO_SRV.
(make_host_part): Ditto.
(ks_hkp_resolve): Set NO_SRV from EXPLICIT_PORT.
(ks_hkp_search): Ditto.
(ks_hkp_get): Ditto.
(ks_hkp_put): Ditto.
--
This implements the behaviour of the keyserver helpers from 1.4 and
2.0.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'dirmngr/http.h')
| -rw-r--r-- | dirmngr/http.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dirmngr/http.h b/dirmngr/http.h index 2a36fdaa8..32556a4e0 100644 --- a/dirmngr/http.h +++ b/dirmngr/http.h @@ -53,6 +53,7 @@ struct parsed_uri_s unsigned int opaque:1;/* Unknown scheme; PATH has the rest. */ unsigned int v6lit:1; /* Host was given as a literal v6 address. */ unsigned int onion:1; /* .onion address given. */ + unsigned int explicit_port :1; /* The port was explicitly specified. */ char *auth; /* username/password for basic auth. */ char *host; /* Host (converted to lowercase). */ unsigned short port; /* Port (always set if the host is set). */ |