[git] GnuPG - branch, master, updated. gnupg-2.1.15-291-g6f1d812

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  6f1d8123d61b3efac94b4c61ee75bd947790ba42 (commit)
      from  8a9341b42cd1891090d45cc068bff84b2b3edb50 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6f1d8123d61b3efac94b4c61ee75bd947790ba42
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 27 15:01:42 2016 +0900

    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 at fsij.org>

diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 284ef09..28a500c 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;

-----------------------------------------------------------------------

Summary of changes:
 dirmngr/dns-stuff.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org