summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2014-02-21 09:09:34 -0800
committerTim Rice <tim@multitalents.net>2014-02-21 09:09:34 -0800
commit03ae081aeaa118361c81ece76eb7cc1aaa2b40c5 (patch)
tree8da4f72528ae3179cdb887fbab9330df6655ae28
parent4a20959d2e3c90e9d66897c0b4032c785672d815 (diff)
20140221
- (tim) [configure.ac] Fix cut-and-paste error. Patch from Bryan Drewery.
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2542215ca..d44388c13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120140221
2 - (tim) [configure.ac] Fix cut-and-paste error. Patch from Bryan Drewery.
3
120140213 420140213
2 - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}] Add compat 5 - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}] Add compat
3 code for older OpenSSL versions that don't have EVP_MD_CTX_copy_ex. 6 code for older OpenSSL versions that don't have EVP_MD_CTX_copy_ex.
diff --git a/configure.ac b/configure.ac
index 0dd3f4541..7c6ce08d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.570 2014/02/13 05:38:33 dtucker Exp $ 1# $Id: configure.ac,v 1.571 2014/02/21 17:09:34 tim 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
17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18AC_REVISION($Revision: 1.570 $) 18AC_REVISION($Revision: 1.571 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -785,7 +785,7 @@ mips-sony-bsd|mips-sony-newsos4)
785 # Preauth crypto occasionally uses file descriptors for crypto offload 785 # Preauth crypto occasionally uses file descriptors for crypto offload
786 # and will crash if they cannot be opened. 786 # and will crash if they cannot be opened.
787 AC_DEFINE([SANDBOX_SKIP_RLIMIT_NOFILE], [1], 787 AC_DEFINE([SANDBOX_SKIP_RLIMIT_NOFILE], [1],
788 [define if setrlimit RLIMIT_NOFILE breaks things])], 788 [define if setrlimit RLIMIT_NOFILE breaks things])
789 ;; 789 ;;
790*-*-bsdi*) 790*-*-bsdi*)
791 AC_DEFINE([SETEUID_BREAKS_SETUID]) 791 AC_DEFINE([SETEUID_BREAKS_SETUID])