summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac6
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 456c1f615..f40e0c057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@
50 [regress/sftp-badcmds.sh] 50 [regress/sftp-badcmds.sh]
51 disable no-replace rename test now that we prefer a POSIX rename; spotted 51 disable no-replace rename test now that we prefer a POSIX rename; spotted
52 by dkrause@ 52 by dkrause@
53 - (djm) [configure.ac] fix alignment of --without-stackprotect description
53 54
5420080315 5520080315
55 - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are 56 - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
@@ -3818,4 +3819,4 @@
3818 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3819 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3819 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3820 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3820 3821
3821$Id: ChangeLog,v 1.4891 2008/03/27 00:26:56 djm Exp $ 3822$Id: ChangeLog,v 1.4892 2008/03/27 01:30:18 djm Exp $
diff --git a/configure.ac b/configure.ac
index b6fa19bd0..aa3ee359d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.395 2008/03/09 11:50:50 dtucker Exp $ 1# $Id: configure.ac,v 1.396 2008/03/27 01:30:18 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
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.395 $) 18AC_REVISION($Revision: 1.396 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -92,7 +92,7 @@ AC_CHECK_DECL(LLONG_MAX, have_llong_max=1, , [#include <limits.h>])
92 92
93use_stack_protector=1 93use_stack_protector=1
94AC_ARG_WITH(stackprotect, 94AC_ARG_WITH(stackprotect,
95 [ --without-stackprotect Don't use compiler's stack protection], [ 95 [ --without-stackprotect Don't use compiler's stack protection], [
96 if test "x$withval" = "xno"; then 96 if test "x$withval" = "xno"; then
97 use_stack_protector=0 97 use_stack_protector=0
98 fi ]) 98 fi ])