From 16078f3deea5b82ea26e2f01dbd3ef3a5ce25410 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sun, 8 Jan 2017 18:04:59 +0100 Subject: dirmngr: Change internal SRV lookup API. * dirmngr/dns-stuff.c (get_dns_srv): Add args SERVICE and PROTO. * dirmngr/http.c (connect_server): Simplify SRV lookup. * dirmngr/ks-engine-hkp.c (map_host): Ditto. * dirmngr/t-dns-stuff.c (main): Adjust for changed get_dns_srv. -- This new API is more convenient because it includes commonly used code. Note that right now http.c's SRV record code is not used. Signed-off-by: Werner Koch --- dirmngr/ks-engine-hkp.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'dirmngr/ks-engine-hkp.c') diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c index a6c22f8cd..283e805f0 100644 --- a/dirmngr/ks-engine-hkp.c +++ b/dirmngr/ks-engine-hkp.c @@ -426,7 +426,6 @@ map_host (ctrl_t ctrl, const char *name, int force_reselect, int refidx; int is_pool = 0; char *cname; - char *srvrecord; struct srventry *srvs; unsigned int srvscount; @@ -448,16 +447,7 @@ map_host (ctrl_t ctrl, const char *name, int force_reselect, if (!is_ip_address (name)) { /* Check for SRV records. */ - srvrecord = xtryasprintf ("_hkp._tcp.%s", name); - if (srvrecord == NULL) - { - err = gpg_error_from_syserror (); - xfree (reftbl); - return err; - } - - err = get_dns_srv (srvrecord, &srvs, &srvscount); - xfree (srvrecord); + err = get_dns_srv (name, "hkp", NULL, &srvs, &srvscount); if (err) { xfree (reftbl); -- cgit v1.2.3