summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac5
-rw-r--r--openbsd-compat/bsd-openpty.c10
-rw-r--r--openbsd-compat/daemon.c10
4 files changed, 29 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c4cf92c..9ca297bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20060711
+ - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c
+ openbsd-compat/daemon.c] Add includes needed by open(2). Conditionally
+ include paths.h. Fixes build error on Solaris.
+
20060710
- (dtucker) [INSTALL] New autoconf version: 2.60.
- OpenBSD CVS Sync
@@ -4839,4 +4844,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4385 2006/07/10 14:20:51 dtucker Exp $
+$Id: ChangeLog,v 1.4386 2006/07/11 08:00:06 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 252e7a99..c6d56bf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.344 2006/07/06 01:56:25 dtucker Exp $
+# $Id: configure.ac,v 1.345 2006/07/11 08:00:06 dtucker Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.344 $)
+AC_REVISION($Revision: 1.345 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h)
@@ -686,6 +686,7 @@ AC_CHECK_HEADERS( \
dirent.h \
endian.h \
features.h \
+ fcntl.h \
floatingpoint.h \
getopt.h \
glob.h \
diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c
index 28929de6..0b77a1da 100644
--- a/openbsd-compat/bsd-openpty.c
+++ b/openbsd-compat/bsd-openpty.c
@@ -35,6 +35,16 @@
#include "includes.h"
#if !defined(HAVE_OPENPTY)
+#include <sys/types.h>
+
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
#ifdef HAVE_UTIL_H
# include <util.h>
#endif /* HAVE_UTIL_H */
diff --git a/openbsd-compat/daemon.c b/openbsd-compat/daemon.c
index f8a0680b..f380139d 100644
--- a/openbsd-compat/daemon.c
+++ b/openbsd-compat/daemon.c
@@ -34,6 +34,16 @@
#ifndef HAVE_DAEMON
+#include <sys/types.h>
+
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
int
daemon(int nochdir, int noclose)
{