summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-03-27 12:30:18 +1100
committerDamien Miller <djm@mindrot.org>2008-03-27 12:30:18 +1100
commitda3155e1595b461cfb51ee28a49279d935eb7259 (patch)
treecec33ad11aa3a3815cf91c030eab5da0e363ea0c
parent6f1c462ca31c97a72e37cc7fb4cb44631f2852b0 (diff)
- (djm) [configure.ac] fix alignment of --without-stackprotect description
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac6
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 456c1f61..f40e0c05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@
[regress/sftp-badcmds.sh]
disable no-replace rename test now that we prefer a POSIX rename; spotted
by dkrause@
+ - (djm) [configure.ac] fix alignment of --without-stackprotect description
20080315
- (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
@@ -3818,4 +3819,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4891 2008/03/27 00:26:56 djm Exp $
+$Id: ChangeLog,v 1.4892 2008/03/27 01:30:18 djm Exp $
diff --git a/configure.ac b/configure.ac
index b6fa19bd..aa3ee359 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.395 2008/03/09 11:50:50 dtucker Exp $
+# $Id: configure.ac,v 1.396 2008/03/27 01:30:18 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.395 $)
+AC_REVISION($Revision: 1.396 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_CONFIG_HEADER(config.h)
@@ -92,7 +92,7 @@ AC_CHECK_DECL(LLONG_MAX, have_llong_max=1, , [#include <limits.h>])
use_stack_protector=1
AC_ARG_WITH(stackprotect,
- [ --without-stackprotect Don't use compiler's stack protection], [
+ [ --without-stackprotect Don't use compiler's stack protection], [
if test "x$withval" = "xno"; then
use_stack_protector=0
fi ])