diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | openbsd-compat/bsd-misc.h | 5 |
3 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20120704 | ||
2 | - (dtucker) [configure.ac openbsd-compat/bsd-misc.h] Add setlinebuf for | ||
3 | platforms that don't have it. "looks good" tim@ | ||
4 | |||
1 | 20120703 | 5 | 20120703 |
2 | - (dtucker) [configure.ac] Detect platforms that can't use select(2) with | 6 | - (dtucker) [configure.ac] Detect platforms that can't use select(2) with |
3 | setrlimit(RLIMIT_NOFILE, rl_zero) and disable the rlimit sandbox on those. | 7 | setrlimit(RLIMIT_NOFILE, rl_zero) and disable the rlimit sandbox on those. |
diff --git a/configure.ac b/configure.ac index f7033bc0b..da919a636 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.494 2012/07/03 12:48:31 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.495 2012/07/03 22:50:10 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.494 $) | 18 | AC_REVISION($Revision: 1.495 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -1571,6 +1571,7 @@ AC_CHECK_FUNCS([ \ | |||
1571 | seteuid \ | 1571 | seteuid \ |
1572 | setgroupent \ | 1572 | setgroupent \ |
1573 | setgroups \ | 1573 | setgroups \ |
1574 | setlinebuf \ | ||
1574 | setlogin \ | 1575 | setlogin \ |
1575 | setpassent\ | 1576 | setpassent\ |
1576 | setpcred \ | 1577 | setpcred \ |
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h index e37175625..eac5217ca 100644 --- a/openbsd-compat/bsd-misc.h +++ b/openbsd-compat/bsd-misc.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bsd-misc.h,v 1.20 2012/02/14 18:03:31 tim Exp $ */ | 1 | /* $Id: bsd-misc.h,v 1.21 2012/07/03 22:50:10 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> | 4 | * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> |
@@ -51,6 +51,9 @@ int setegid(uid_t); | |||
51 | const char *strerror(int); | 51 | const char *strerror(int); |
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | #if !defined(HAVE_SETLINEBUF) | ||
55 | #define setlinebuf(a) (setvbuf((a), NULL, _IOLBF, 0)) | ||
56 | #endif | ||
54 | 57 | ||
55 | #ifndef HAVE_UTIMES | 58 | #ifndef HAVE_UTIMES |
56 | #ifndef HAVE_STRUCT_TIMEVAL | 59 | #ifndef HAVE_STRUCT_TIMEVAL |