[git] GnuPG - branch, master, updated. gnupg-2.2.7-153-g3e6ad30

[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  3e6ad302eaf3a4a9f3e60379133b3dfdbe0e1b2d (commit)
       via  5b40338f12762cd74238c2d2b3101c33dd2d0ed3 (commit)
      from  cb52eb76b3ba0269742c5322e10a2b5151dafaf2 (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 3e6ad302eaf3a4a9f3e60379133b3dfdbe0e1b2d
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Jun 14 13:10:57 2018 +0900

    libdns: Sync to upstream.
    
    * dirmngr/dns.c (dns_nssconf_loadfile): Handle exclamation mark.
    
    --
    
    Reverting local change, merge upstream's debug-tracing branch.
    (commit 21281fc1b63bb74d51762b8e363c49b1a258783d)
    
    Fixes-commit: d4c0187dd93163f12e9f953366adef81ecf526a6
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/dirmngr/dns.c b/dirmngr/dns.c
index 8e8b6db..13ef4b8 100644
--- a/dirmngr/dns.c
+++ b/dirmngr/dns.c
@@ -6096,17 +6096,9 @@ int dns_nssconf_loadfile(struct dns_resolv_conf *resconf, FILE *fp) {
 			dns_anyconf_skip(" \t", fp);
 
 			if ('[' == dns_anyconf_peek(fp)) {
-				dns_anyconf_skip("[ \t", fp);
+				dns_anyconf_skip("[! \t", fp);
 
-				for (;;) {
-					if ('!' == dns_anyconf_peek(fp)) {
-						dns_anyconf_skip("! \t", fp);
-						/* FIXME: negating statuses; currently not implemented */
-						dns_anyconf_skip("^#;]\n", fp); /* skip to end of criteria */
-						break;
-					}
-
-					if (!dns_anyconf_scan(&cf, "%w_", fp, &error)) break;
+				while (dns_anyconf_scan(&cf, "%w_", fp, &error)) {
 					dns_anyconf_skip("= \t", fp);
 					if (!dns_anyconf_scan(&cf, "%w_", fp, &error)) {
 						dns_anyconf_pop(&cf); /* discard status */

commit 5b40338f12762cd74238c2d2b3101c33dd2d0ed3
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Jun 14 13:01:45 2018 +0900

    dirmngr: Fix recursive resolver mode.
    
    * dirmngr/dns-stuff.c (libdns_init): Initialize options.recurse.
    
    --
    
    To reproduce an error, run:
    
        ./t-dns-stuff --debug --recursive-resolver www.gnupg.org
    
    Then, it returns "No name" error.  That's because there was only setup
    for root servers, and no setup for recursive query in fact.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 7324aae..ffac816 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -612,6 +612,8 @@ libdns_init (void)
       }
   }
 
+  ld.resolv_conf->options.recurse = recursive_resolver_p ();
+
   /* dns_hints_local for stub mode, dns_hints_root for recursive.  */
   ld.hints = (recursive_resolver
               ? dns_hints_root  (ld.resolv_conf, &derr)

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

Summary of changes:
 dirmngr/dns-stuff.c |  2 ++
 dirmngr/dns.c       | 12 ++----------
 2 files changed, 4 insertions(+), 10 deletions(-)


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