Merge branch 'STABLE-BRANCH-2-2' into master
authorNIIBE Yutaka <gniibe@fsij.org>
Fri, 26 Jan 2018 01:47:28 +0000 (10:47 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Fri, 26 Jan 2018 01:47:28 +0000 (10:47 +0900)
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
agent/command-ssh.c
configure.ac

index 866f439..4ec02ec 100644 (file)
@@ -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
index 549745c..6268766 100644 (file)
@@ -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