mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
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 <wk@gnupg.org>
This commit is contained in:
parent
284ec54495
commit
af8b68fae3
6 changed files with 103 additions and 42 deletions
|
@ -92,6 +92,9 @@ struct srventry
|
|||
};
|
||||
|
||||
|
||||
/* Set verbosity and debug mode for this module. */
|
||||
void set_dns_verbose (int verbose, int debug);
|
||||
|
||||
/* Calling this function with YES set to True forces the use of the
|
||||
* standard resolver even if dirmngr has been built with support for
|
||||
* an alternative resolver. */
|
||||
|
@ -145,8 +148,9 @@ gpg_error_t get_dns_cert (const char *name, int want_certtype,
|
|||
unsigned char **r_fpr, size_t *r_fprlen,
|
||||
char **r_url);
|
||||
|
||||
|
||||
int getsrv (const char *name,struct srventry **list);
|
||||
/* Return an array of SRV records. */
|
||||
gpg_error_t get_dns_srv (const char *name,
|
||||
struct srventry **list, unsigned int *r_count);
|
||||
|
||||
|
||||
#endif /*GNUPG_DIRMNGR_DNS_STUFF_H*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue