diff options
| author | Werner Koch <[email protected]> | 2017-01-09 09:11:20 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-01-09 09:28:25 +0000 |
| commit | c2cbe2f87c480c62239dc4c2cbb352acd98cd267 (patch) | |
| tree | 6b2e6e8c91a189e8dcd8c9aad6df5255f006a326 /dirmngr/http.c | |
| parent | doc: Update man page for watchgnupg (diff) | |
| download | gnupg-c2cbe2f87c480c62239dc4c2cbb352acd98cd267.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to 'dirmngr/http.c')
| -rw-r--r-- | dirmngr/http.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dirmngr/http.c b/dirmngr/http.c index 7a028047d..0a47d9f59 100644 --- a/dirmngr/http.c +++ b/dirmngr/http.c @@ -1169,6 +1169,7 @@ do_parse_uri (parsed_uri_t uri, int only_local_part, uri->opaque = 0; uri->v6lit = 0; uri->onion = 0; + uri->explicit_port = 0; /* A quick validity check. */ if (strspn (p, VALID_URI_CHARS) != n) @@ -1241,6 +1242,7 @@ do_parse_uri (parsed_uri_t uri, int only_local_part, { *p3++ = '\0'; uri->port = atoi (p3); + uri->explicit_port = 1; } if ((n = remove_escapes (uri->host)) < 0) |