From 5b447c0aac0dd444251e276f6bb3bbbe1c05331c Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 26 Jan 2014 09:46:53 +1100 Subject: [PATCH] - (djm) [configure.ac] correct AC_DEFINE for previous. --- ChangeLog | 1 + configure.ac | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b965261a..f736fddc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ RLIMIT_NOFILE pseudo-sandbox on FreeBSD. In some configurations, libc will attempt to open additional file descriptors for crypto offload and crash if they cannot be opened. + - (djm) [configure.ac] correct AC_DEFINE for previous. 20130125 - (djm) [configure.ac] Fix detection of capsicum sandbox on FreeBSD diff --git a/configure.ac b/configure.ac index 4a398418a..ce881e279 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.563 2014/01/25 22:39:53 djm Exp $ +# $Id: configure.ac,v 1.564 2014/01/25 22:46:54 djm 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.563 $) +AC_REVISION($Revision: 1.564 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -782,7 +782,8 @@ mips-sony-bsd|mips-sony-newsos4) TEST_MALLOC_OPTIONS="AJRX" # Preauth crypto occasionally uses file descriptors for crypto offload # and will crash if they cannot be opened. - AC_DEFINE([SANDBOX_SKIP_RLIMIT_NOFILE]) + AC_DEFINE([SANDBOX_SKIP_RLIMIT_NOFILE], [1], + [define if setrlimit RLIMIT_NOFILE breaks things])], ;; *-*-bsdi*) AC_DEFINE([SETEUID_BREAKS_SETUID])