From 6f1d8123d61b3efac94b4c61ee75bd947790ba42 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 27 Oct 2016 15:01:42 +0900 Subject: [PATCH] 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 --- dirmngr/dns-stuff.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c index 284ef0946..28a500cd9 100644 --- a/dirmngr/dns-stuff.c +++ b/dirmngr/dns-stuff.c @@ -682,8 +682,8 @@ get_dns_cert (const char *name, int want_certtype, my_protect (); if (ret) { - err = gpg_error_from_syserror (); - /* log_error ("DNS query failed: %s\n", strerror (errno)); */ + err = ret; + /* log_error ("DNS query failed: %s\n", strerror (err)); */ adns_finish (state); return err; } @@ -1036,7 +1036,7 @@ getsrv (const char *name,struct srventry **list) my_protect (); if (rc) { - log_error ("DNS query failed: %s\n", strerror (errno)); + log_error ("DNS query failed: %s\n", strerror (rc)); adns_finish (state); return -1; } @@ -1281,7 +1281,7 @@ get_dns_cname (const char *name, char **r_cname) my_protect (); if (rc) { - err = gpg_error_from_syserror (); + err = rc; log_error ("DNS query failed: %s\n", gpg_strerror (err)); adns_finish (state); return err;