summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-01-26 09:39:53 +1100
committerDamien Miller <djm@mindrot.org>2014-01-26 09:39:53 +1100
commit2035b2236d3b1f76c749c642a43e03c85eae76e6 (patch)
tree7e4d397d9f030d5180f6a9e1dab7d9f39e01d065 /configure.ac
parenta92ac7410475fbb00383c7402aa954dc0a75ae19 (diff)
downloadopenssh-git-2035b2236d3b1f76c749c642a43e03c85eae76e6.tar.gz
- (djm) [configure.ac sandbox-capsicum.c sandbox-rlimit.c] Disable
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.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 5e5e4d13..4a398418 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.562 2014/01/25 02:16:59 djm Exp $
+# $Id: configure.ac,v 1.563 2014/01/25 22:39:53 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.562 $)
+AC_REVISION($Revision: 1.563 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])
@@ -780,6 +780,9 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE([BROKEN_STRNVIS], [1],
[FreeBSD strnvis argument order is swapped compared to OpenBSD])
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])
;;
*-*-bsdi*)
AC_DEFINE([SETEUID_BREAKS_SETUID])