[git] GnuPG - branch, master, updated. gnupg-2.1.17-99-g88ade47

[by Phil Pennock]

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  88ade475c56ac3712d6bd6d41ae38e1421dcb320 (commit)
       via  b3e7a112e0c3536f12a9425a547d4a1c77db8b3c (commit)
       via  a85731ada2d361eacddc5ae92f80d34792dd4b5e (commit)
      from  65ed117ac0cc5f567eca78168d5931168c4880bc (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 88ade475c56ac3712d6bd6d41ae38e1421dcb320
Author: Phil Pennock <gnupg-devel at spodhuis.org>
Date:   Thu Jan 19 01:21:42 2017 -0500

    dirmngr: Handle missing nsswitch.conf.
    
    * dirmngr/dns-stuff.c (libdns_init): Fallback to files,dns.
    
    --
    
    Signed-off-by: Phil Pennock <phil at pennock-tech.com>
    
    ChangeLog entry by wk.
    
    This fixed the problem:
    
      Short version: macOS doesn't include /etc/nsswitch.conf and GnuPG's
      dirmngr is hard-erroring when that file is missing, such that no DNS
      operations succeed and --recv-key returns ENOENT type errors to the
      caller.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 28ecb18..eae888b 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -478,7 +478,16 @@ libdns_init (void)
       if (err)
         {
           log_error ("failed to load '%s': %s\n", fname, gpg_strerror (err));
-          goto leave;
+          /* not fatal, nsswitch.conf is not used on all systems; assume
+           * classic behavior instead.  Our dns library states "bf" which tries
+           * DNS then Files, which is not classic; FreeBSD
+           * /usr/src/lib/libc/net/gethostnamadr.c defines default_src[] which
+           * is Files then DNS, which is. */
+          log_debug ("dns: fallback resolution order, files then DNS");
+          ld.resolv_conf->lookup[0] = 'f';
+          ld.resolv_conf->lookup[1] = 'b';
+          ld.resolv_conf->lookup[2] = '\0';
+          err = GPG_ERR_NO_ERROR;
         }
 
 #endif /* Unix */

commit b3e7a112e0c3536f12a9425a547d4a1c77db8b3c
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jan 23 10:54:39 2017 +0100

    dco: Register Phil Pennock.
    
    --

diff --git a/AUTHORS b/AUTHORS
index 50b2095..1054b89 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -204,6 +204,10 @@ Yann E. MORIN <yann.morin.1998 at free.fr>
 Arnaud Fontaine <arnaud.fontaine at ssi.gouv.fr>
 2016-10-17:580484F4.8040806 at ssi.gouv.fr:
 
+Phil Pennock <phil.pennock at spodhuis.org>
+Phil Pennock <phil at pennock-tech.com>
+2017-01-19:20170119061225.GA26207 at breadbox.private.spodhuis.org:
+
 
 Other authors
 =============

commit a85731ada2d361eacddc5ae92f80d34792dd4b5e
Author: Damien Goutte-Gattat <dgouttegattat at incenp.org>
Date:   Tue Jan 17 20:42:09 2017 +0100

    gpg: Fix misleading log message when checking regexp.
    
    * src/trustdb.c (check_regexp): Correctly print whether the
    regexp matched or not.
    --
    
    This patch fixes the log message displayed when gpg attempts to
    match the regexp associated with a trust signature with an user ID.
    The current message interprets the 'ret' variable backwards, and
    displays 'YES' when the regexp actually fails to match.
    
    Signed-off-by: Damien Goutte-Gattat <dgouttegattat at incenp.org>

diff --git a/g10/trustdb.c b/g10/trustdb.c
index c113b7e..75714ab 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1550,14 +1550,14 @@ check_regexp(const char *expr,const char *string)
       {
 	ret=regexec(&pat,string,0,NULL,0);
 	regfree(&pat);
-	ret=(ret==0);
       }
+    ret=(ret==0);
   }
 #endif
 
   if(DBG_TRUST)
     log_debug("regexp '%s' ('%s') on '%s': %s\n",
-	      regexp,expr,string,ret==0?"YES":"NO");
+	      regexp,expr,string,ret?"YES":"NO");
 
   xfree(regexp);
 

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

Summary of changes:
 AUTHORS             |  4 ++++
 dirmngr/dns-stuff.c | 11 ++++++++++-
 g10/trustdb.c       |  4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)


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