1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

dirmngr: More ADNS error fix.

* dirmngr/dns-stuff.c (get_dns_cert, getsrv, get_dns_cname): Fix return
value.

--
GnuPG-bug-id: 2745
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2016-10-27 15:01:42 +09:00
parent 8a9341b42c
commit 6f1d8123d6

View File

@ -682,8 +682,8 @@ get_dns_cert (const char *name, int want_certtype,
my_protect (); my_protect ();
if (ret) if (ret)
{ {
err = gpg_error_from_syserror (); err = ret;
/* log_error ("DNS query failed: %s\n", strerror (errno)); */ /* log_error ("DNS query failed: %s\n", strerror (err)); */
adns_finish (state); adns_finish (state);
return err; return err;
} }
@ -1036,7 +1036,7 @@ getsrv (const char *name,struct srventry **list)
my_protect (); my_protect ();
if (rc) if (rc)
{ {
log_error ("DNS query failed: %s\n", strerror (errno)); log_error ("DNS query failed: %s\n", strerror (rc));
adns_finish (state); adns_finish (state);
return -1; return -1;
} }
@ -1281,7 +1281,7 @@ get_dns_cname (const char *name, char **r_cname)
my_protect (); my_protect ();
if (rc) if (rc)
{ {
err = gpg_error_from_syserror (); err = rc;
log_error ("DNS query failed: %s\n", gpg_strerror (err)); log_error ("DNS query failed: %s\n", gpg_strerror (err));
adns_finish (state); adns_finish (state);
return err; return err;