aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr/dirmngr.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-12-19 22:27:02 +0000
committerWerner Koch <[email protected]>2016-12-19 22:27:02 +0000
commitaf8b68fae39b1378c769e0de6ba6437ea1aac7e3 (patch)
tree16bc96db023b812d21422caf3c029dcee0c91dcf /dirmngr/dirmngr.c
parentbuild: Add target to sign the windows installer. (diff)
downloadgnupg-af8b68fae39b1378c769e0de6ba6437ea1aac7e3.tar.gz
gnupg-af8b68fae39b1378c769e0de6ba6437ea1aac7e3.zip
dirmngr: Fix problems with the getsrv function.
* dirmngr/dns-stuff.c (opt_debug, opt_verbose): New vars. (set_dns_verbose): New func. (libdns_switch_port_p): Add debug output. (resolve_dns_name): Ditto. (get_dns_cert): Ditto. (get_dns_cname): Ditto. (getsrv_libdns, getsrv_standard): Change SRVCOUNT to an unsigend int. (getsrv): Rename to ... ((get_dns_srv): this. Add arg R_COUNT and return an error. Add debug output. * dirmngr/http.c: Adjust for chnaged getsrv(). * dirmngr/ks-engine-hkp.c (map_host): Ditto. * dirmngr/t-dns-stuff.c (main): Ditto. Call set_dns_verbose. * dirmngr/dirmngr.c (parse_rereadable_options): Call set_dns_verbose. -- Due to our switch to Libdns getsrv didn't worked correctly because it returned -1 for an NXDOMAIN. However, it is perfectly okay to have no SRV record and thus we change the way this function is called to be aligned with the other functions and also map NXDOMAIN to a zero SRV record count. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/dirmngr.c')
-rw-r--r--dirmngr/dirmngr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 0d896f1ef..bb4d9f3ef 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -640,6 +640,8 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
return 0; /* Not handled. */
}
+ set_dns_verbose (opt.verbose, !!DBG_DNS);
+
return 1; /* Handled. */
}