mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
dirmngr: Print a WARNING status for DNS config problems.
* dirmngr/dirmngr-status.h: New. * dirmngr/dirmngr.h: Include dirmngr-status.h and move some prototypes to that file. * dirmngr/t-support.c: New. * dirmngr/Makefile.am (dirmngr_SOURCES): Add dirmngr-status.h. (t_common_src): Add t-support.c. * dirmngr/server.c (dirmngr_status_printf): Bypass if CTRL is NULL. * dirmngr/dns-stuff.c: Include dirmngr-status.h. (libdns_init): Print WARNING status line. Change call callers to take and pass a CTRL argument. * g10/call-dirmngr.c (ks_status_cb): Print info for new WARNING status. -- To test this you can change RESOLV_CONF_NAME in dns-stuff.c and run gpg --recv-key -v SOMETHING. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
9aa1b368ef
commit
bd4048c533
16 changed files with 196 additions and 93 deletions
|
@ -178,7 +178,7 @@ main (int argc, char **argv)
|
|||
if (verbose || any_options)
|
||||
printf ("CERT lookup on '%s'\n", name);
|
||||
|
||||
err = get_dns_cert (name, DNS_CERTTYPE_ANY, &key, &keylen,
|
||||
err = get_dns_cert (NULL, name, DNS_CERTTYPE_ANY, &key, &keylen,
|
||||
&fpr, &fpr_len, &url);
|
||||
if (err)
|
||||
printf ("get_dns_cert failed: %s <%s>\n",
|
||||
|
@ -218,7 +218,7 @@ main (int argc, char **argv)
|
|||
char *cname;
|
||||
|
||||
printf ("CNAME lookup on '%s'\n", name);
|
||||
err = get_dns_cname (name, &cname);
|
||||
err = get_dns_cname (NULL, name, &cname);
|
||||
if (err)
|
||||
printf ("get_dns_cname failed: %s <%s>\n",
|
||||
gpg_strerror (err), gpg_strsource (err));
|
||||
|
@ -234,7 +234,7 @@ main (int argc, char **argv)
|
|||
unsigned int count;
|
||||
int i;
|
||||
|
||||
err = get_dns_srv (name? name : "_hkp._tcp.wwwkeys.pgp.net",
|
||||
err = get_dns_srv (NULL, name? name : "_hkp._tcp.wwwkeys.pgp.net",
|
||||
NULL, NULL, &srv, &count);
|
||||
if (err)
|
||||
printf ("get_dns_srv failed: %s <%s>\n",
|
||||
|
@ -261,7 +261,7 @@ main (int argc, char **argv)
|
|||
|
||||
printf ("Lookup on '%s'\n", name);
|
||||
|
||||
err = resolve_dns_name (name, 0, 0, SOCK_STREAM, &aibuf, &cname);
|
||||
err = resolve_dns_name (NULL, name, 0, 0, SOCK_STREAM, &aibuf, &cname);
|
||||
if (err)
|
||||
{
|
||||
fprintf (stderr, PGM": resolving '%s' failed: %s\n",
|
||||
|
@ -278,7 +278,7 @@ main (int argc, char **argv)
|
|||
ai->family == AF_INET? "inet4" : "? ",
|
||||
ai->socktype, ai->protocol);
|
||||
|
||||
err = resolve_dns_addr (ai->addr, ai->addrlen,
|
||||
err = resolve_dns_addr (NULL, ai->addr, ai->addrlen,
|
||||
(DNS_NUMERICHOST
|
||||
| (opt_bracket? DNS_WITHBRACKET:0)),
|
||||
&host);
|
||||
|
@ -290,7 +290,7 @@ main (int argc, char **argv)
|
|||
xfree (host);
|
||||
}
|
||||
|
||||
err = resolve_dns_addr (ai->addr, ai->addrlen,
|
||||
err = resolve_dns_addr (NULL, ai->addr, ai->addrlen,
|
||||
(opt_bracket? DNS_WITHBRACKET:0),
|
||||
&host);
|
||||
if (err)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue