diff options
| author | NIIBE Yutaka <[email protected]> | 2018-01-26 01:47:28 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-01-26 01:47:28 +0000 |
| commit | c2e69a7a8c4b21e125babd50e464e71e1535f173 (patch) | |
| tree | 0275855c5565279a8e2d3cf4f2964fc8035eaba1 | |
| parent | Merge branch 'STABLE-BRANCH-2-2' into master (diff) | |
| parent | agent: Fix last commit. (diff) | |
| download | gnupg-c2e69a7a8c4b21e125babd50e464e71e1535f173.tar.gz gnupg-c2e69a7a8c4b21e125babd50e464e71e1535f173.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | agent/command-ssh.c | 3 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/agent/command-ssh.c b/agent/command-ssh.c index 866f43959..4ec02ec02 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -44,6 +44,9 @@ #include <sys/socket.h> #include <sys/un.h> #endif /*!HAVE_W32_SYSTEM*/ +#ifdef HAVE_SYS_UCRED_H +#include <sys/ucred.h> +#endif #ifdef HAVE_UCRED_H #include <ucred.h> #endif diff --git a/configure.ac b/configure.ac index 549745c4c..62687664a 100644 --- a/configure.ac +++ b/configure.ac @@ -1289,7 +1289,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]) + ucred.h sys/ucred.h sys/sysmacros.h sys/mkdev.h]) AC_HEADER_TIME |