[git] GnuPG - branch, master, updated. gnupg-2.2.7-163-g1aacd12

[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  1aacd12471935a354cfd85ee1805edc7eb16e6c5 (commit)
      from  592deeddb9bf4ae9b3e236b439e2f39644eb6d46 (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 1aacd12471935a354cfd85ee1805edc7eb16e6c5
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Jul 2 10:37:49 2018 +0900

    libdns: For SOCKS connection, just fails.
    
    * dirmngr/dns.c (dns_res_exec): If it's DNS_SO_SOCKS_CONN, don't
    iterate to other server, but return the error immediately.
    
    --
    
    In the function libdns_switch_port_p in dns-stuff.c, this patch
    allows to fallback using TOR_PORT2 correctly.
    
    Fixes-commit: bcdbf8b8ebe9d61160e0b007dabe1b6462ffbc93
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/dirmngr/dns.c b/dirmngr/dns.c
index f82ed26..77f83f4 100644
--- a/dirmngr/dns.c
+++ b/dirmngr/dns.c
@@ -8846,7 +8846,7 @@ exec:
 			dgoto(R->sp, DNS_R_FOREACH_A);
 
 		error = dns_so_check(&R->so);
-		if (error == ECONNREFUSED)
+		if (R->so.state != DNS_SO_SOCKS_CONN && error == ECONNREFUSED)
 			dgoto(R->sp, DNS_R_FOREACH_A);
 		else if (error)
 			goto error;

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

Summary of changes:
 dirmngr/dns.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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