diff options
author | Darren Tucker <dtucker@zip.com.au> | 2006-09-03 22:44:49 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2006-09-03 22:44:49 +1000 |
commit | ed0b59218ef9bb41a25922885d3fae7e67b8ba04 (patch) | |
tree | e0f887b046a8ca04609ae104a43a30ad7f02c9dd | |
parent | 46aa3e0ce1d2f341bb3e4d46035faae3bb5ee69c (diff) |
- (dtucker) [configure.ac openbsd-compat/openbsd-compat.h] Check for
declaration of writev(2) and declare it ourselves if necessary. Makes
the atomiciov() calls build on really old systems. ok djm@
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 7 |
3 files changed, 20 insertions, 4 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20060903 | ||
2 | - (dtucker) [configure.ac openbsd-compat/openbsd-compat.h] Check for | ||
3 | declaration of writev(2) and declare it ourselves if necessary. Makes | ||
4 | the atomiciov() calls build on really old systems. ok djm@ | ||
5 | |||
1 | 20060902 | 6 | 20060902 |
2 | - (dtucker) [openbsd-compat/port-irix.c] Add errno.h, found by Iain Morgan. | 7 | - (dtucker) [openbsd-compat/port-irix.c] Add errno.h, found by Iain Morgan. |
3 | - (dtucker) [ssh-keyscan.c ssh-rand-helper.c ssh.c sshconnect.c | 8 | - (dtucker) [ssh-keyscan.c ssh-rand-helper.c ssh.c sshconnect.c |
@@ -5385,4 +5390,4 @@ | |||
5385 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 5390 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
5386 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 5391 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
5387 | 5392 | ||
5388 | $Id: ChangeLog,v 1.4527 2006/09/02 05:32:40 dtucker Exp $ | 5393 | $Id: ChangeLog,v 1.4528 2006/09/03 12:44:49 dtucker Exp $ |
diff --git a/configure.ac b/configure.ac index c37d7f499..cdabbd8a1 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.357 2006/09/01 10:29:11 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.358 2006/09/03 12:44:49 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.357 $) | 18 | AC_REVISION($Revision: 1.358 $) |
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) |
@@ -1328,6 +1328,12 @@ AC_CHECK_DECLS(O_NONBLOCK, , , | |||
1328 | #endif | 1328 | #endif |
1329 | ]) | 1329 | ]) |
1330 | 1330 | ||
1331 | AC_CHECK_DECLS(writev, , , [ | ||
1332 | #include <sys/types.h> | ||
1333 | #include <sys/uio.h> | ||
1334 | #include <unistd.h> | ||
1335 | ]) | ||
1336 | |||
1331 | AC_CHECK_FUNCS(setresuid, [ | 1337 | AC_CHECK_FUNCS(setresuid, [ |
1332 | dnl Some platorms have setresuid that isn't implemented, test for this | 1338 | dnl Some platorms have setresuid that isn't implemented, test for this |
1333 | AC_MSG_CHECKING(if setresuid seems to work) | 1339 | AC_MSG_CHECKING(if setresuid seems to work) |
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 278ac71d9..aac2e6cbc 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.41 2006/08/30 17:24:42 djm Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.42 2006/09/03 12:44:50 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -131,6 +131,11 @@ int getgrouplist(const char *, gid_t, gid_t *, int *); | |||
131 | int BSDgetopt(int argc, char * const *argv, const char *opts); | 131 | int BSDgetopt(int argc, char * const *argv, const char *opts); |
132 | #endif | 132 | #endif |
133 | 133 | ||
134 | #if defined(HAVE_DECL_WRITEV) && HAVE_DECL_WRITEV == 0 | ||
135 | # include <sys/types.h> | ||
136 | # include <sys/uio.h> | ||
137 | int writev(int, struct iovec *, int); | ||
138 | #endif | ||
134 | 139 | ||
135 | /* Home grown routines */ | 140 | /* Home grown routines */ |
136 | #include "bsd-misc.h" | 141 | #include "bsd-misc.h" |