[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.4-13-g08e686a

[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, STABLE-BRANCH-2-2 has been updated
       via  08e686a6a6d5bcb5410228b388745d09686b260c (commit)
      from  91a3d15cee32f82a8422e76655a605c5048eaad8 (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 08e686a6a6d5bcb5410228b388745d09686b260c
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Jan 26 10:08:29 2018 +0900

    agent: More fix for get_client_pid for portability.
    
        * configure.ac: Check sys/ucred.h instead of ucred.h.
        * agent/command-ssh.c: Include sys/ucred.h.
    
    --
    
    It's *BSD and macOS thing.
    
    Fixes-commit: f7f806afa5083617f4aba02fc3b285b06a7d73d4
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 9d45a18..213f3f9 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -44,8 +44,8 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #endif /*!HAVE_W32_SYSTEM*/
-#ifdef HAVE_UCRED_H
-#include <ucred.h>
+#ifdef HAVE_SYS_UCRED_H
+#include <sys/ucred.h>
 #endif
 
 #include "agent.h"
diff --git a/configure.ac b/configure.ac
index c3fce31..424ce7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1278,7 +1278,7 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS([string.h unistd.h langinfo.h termio.h locale.h getopt.h \
                   pty.h utmp.h pwd.h inttypes.h signal.h sys/select.h     \
                   stdint.h signal.h util.h libutil.h termios.h \
-                  ucred.h sys/sysmacros.h sys/mkdev.h])
+                  sys/ucred.h sys/sysmacros.h sys/mkdev.h])
 
 AC_HEADER_TIME
 

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

Summary of changes:
 agent/command-ssh.c | 4 ++--
 configure.ac        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


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