[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.8-13-gcca92ca

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, STABLE-BRANCH-2-2 has been updated
       via  cca92ca5348999a3564dd54d7b0a103cc9e7640c (commit)
      from  72a35ffee022f1bf180d02250c5be6a4edb599e7 (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 cca92ca5348999a3564dd54d7b0a103cc9e7640c
Author: NIIBE Yutaka <[email protected]>
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.
    
    --
    
    Cherry picked from master commit:
        1aacd12471935a354cfd85ee1805edc7eb16e6c5
    
    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 <[email protected]>

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