diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | openbsd-compat/bsd-openpty.c | 10 | ||||
-rw-r--r-- | openbsd-compat/daemon.c | 10 |
4 files changed, 29 insertions, 3 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20060711 | ||
2 | - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c | ||
3 | openbsd-compat/daemon.c] Add includes needed by open(2). Conditionally | ||
4 | include paths.h. Fixes build error on Solaris. | ||
5 | |||
1 | 20060710 | 6 | 20060710 |
2 | - (dtucker) [INSTALL] New autoconf version: 2.60. | 7 | - (dtucker) [INSTALL] New autoconf version: 2.60. |
3 | - OpenBSD CVS Sync | 8 | - OpenBSD CVS Sync |
@@ -4839,4 +4844,4 @@ | |||
4839 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4844 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4840 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4845 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4841 | 4846 | ||
4842 | $Id: ChangeLog,v 1.4385 2006/07/10 14:20:51 dtucker Exp $ | 4847 | $Id: ChangeLog,v 1.4386 2006/07/11 08:00:06 dtucker Exp $ |
diff --git a/configure.ac b/configure.ac index 252e7a993..c6d56bf4a 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.344 2006/07/06 01:56:25 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.345 2006/07/11 08:00:06 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.344 $) | 18 | AC_REVISION($Revision: 1.345 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | AC_CONFIG_HEADER(config.h) | 21 | AC_CONFIG_HEADER(config.h) |
@@ -686,6 +686,7 @@ AC_CHECK_HEADERS( \ | |||
686 | dirent.h \ | 686 | dirent.h \ |
687 | endian.h \ | 687 | endian.h \ |
688 | features.h \ | 688 | features.h \ |
689 | fcntl.h \ | ||
689 | floatingpoint.h \ | 690 | floatingpoint.h \ |
690 | getopt.h \ | 691 | getopt.h \ |
691 | glob.h \ | 692 | glob.h \ |
diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c index 28929de67..0b77a1da9 100644 --- a/openbsd-compat/bsd-openpty.c +++ b/openbsd-compat/bsd-openpty.c | |||
@@ -35,6 +35,16 @@ | |||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | #if !defined(HAVE_OPENPTY) | 36 | #if !defined(HAVE_OPENPTY) |
37 | 37 | ||
38 | #include <sys/types.h> | ||
39 | |||
40 | #ifdef HAVE_SYS_STAT_H | ||
41 | # include <sys/stat.h> | ||
42 | #endif | ||
43 | |||
44 | #ifdef HAVE_FCNTL_H | ||
45 | # include <fcntl.h> | ||
46 | #endif | ||
47 | |||
38 | #ifdef HAVE_UTIL_H | 48 | #ifdef HAVE_UTIL_H |
39 | # include <util.h> | 49 | # include <util.h> |
40 | #endif /* HAVE_UTIL_H */ | 50 | #endif /* HAVE_UTIL_H */ |
diff --git a/openbsd-compat/daemon.c b/openbsd-compat/daemon.c index f8a0680bf..f380139d3 100644 --- a/openbsd-compat/daemon.c +++ b/openbsd-compat/daemon.c | |||
@@ -34,6 +34,16 @@ | |||
34 | 34 | ||
35 | #ifndef HAVE_DAEMON | 35 | #ifndef HAVE_DAEMON |
36 | 36 | ||
37 | #include <sys/types.h> | ||
38 | |||
39 | #ifdef HAVE_SYS_STAT_H | ||
40 | # include <sys/stat.h> | ||
41 | #endif | ||
42 | |||
43 | #ifdef HAVE_FCNTL_H | ||
44 | # include <fcntl.h> | ||
45 | #endif | ||
46 | |||
37 | int | 47 | int |
38 | daemon(int nochdir, int noclose) | 48 | daemon(int nochdir, int noclose) |
39 | { | 49 | { |