diff options
author | Damien Miller <djm@mindrot.org> | 2014-01-26 09:46:53 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-01-26 09:46:53 +1100 |
commit | 5b447c0aac0dd444251e276f6bb3bbbe1c05331c (patch) | |
tree | b08f3b48dc51f654d7a701d4143a1c8795800b6d | |
parent | 2035b2236d3b1f76c749c642a43e03c85eae76e6 (diff) |
- (djm) [configure.ac] correct AC_DEFINE for previous.
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | configure.ac | 7 |
2 files changed, 5 insertions, 3 deletions
@@ -16,6 +16,7 @@ | |||
16 | RLIMIT_NOFILE pseudo-sandbox on FreeBSD. In some configurations, | 16 | RLIMIT_NOFILE pseudo-sandbox on FreeBSD. In some configurations, |
17 | libc will attempt to open additional file descriptors for crypto | 17 | libc will attempt to open additional file descriptors for crypto |
18 | offload and crash if they cannot be opened. | 18 | offload and crash if they cannot be opened. |
19 | - (djm) [configure.ac] correct AC_DEFINE for previous. | ||
19 | 20 | ||
20 | 20130125 | 21 | 20130125 |
21 | - (djm) [configure.ac] Fix detection of capsicum sandbox on FreeBSD | 22 | - (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 @@ | |||
1 | # $Id: configure.ac,v 1.563 2014/01/25 22:39:53 djm Exp $ | 1 | # $Id: configure.ac,v 1.564 2014/01/25 22:46:54 djm 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.563 $) | 18 | AC_REVISION($Revision: 1.564 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -782,7 +782,8 @@ mips-sony-bsd|mips-sony-newsos4) | |||
782 | TEST_MALLOC_OPTIONS="AJRX" | 782 | TEST_MALLOC_OPTIONS="AJRX" |
783 | # Preauth crypto occasionally uses file descriptors for crypto offload | 783 | # Preauth crypto occasionally uses file descriptors for crypto offload |
784 | # and will crash if they cannot be opened. | 784 | # and will crash if they cannot be opened. |
785 | AC_DEFINE([SANDBOX_SKIP_RLIMIT_NOFILE]) | 785 | AC_DEFINE([SANDBOX_SKIP_RLIMIT_NOFILE], [1], |
786 | [define if setrlimit RLIMIT_NOFILE breaks things])], | ||
786 | ;; | 787 | ;; |
787 | *-*-bsdi*) | 788 | *-*-bsdi*) |
788 | AC_DEFINE([SETEUID_BREAKS_SETUID]) | 789 | AC_DEFINE([SETEUID_BREAKS_SETUID]) |