From 9edcbff46ff01c8d5dee9c1aa843f09e9ad8a80e Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 17 Jan 2014 21:54:32 +1100
Subject:  - (dtucker) [configure.ac] Have --without-toolchain-hardening not
 turn off    stack-protector since that has a separate flag that's been around
 a while.

---
 ChangeLog    | 2 ++
 configure.ac | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d6ed13f81..fa793d78a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,8 @@
  - (dtucker) [openbsd-compat/bsd-statvfs.h] Only start including headers if we
    need them to cut down on the name collisions.
  - (dtucker) [configure.ac] Also look in inttypes.h for uintXX_t types.
+ - (dtucker) [configure.ac] Have --without-hardening not turn off
+   stack-protector since that has a separate flag that's been around a while.
 
 20140118
  - (djm) OpenBSD CVS Sync
diff --git a/configure.ac b/configure.ac
index 4f40afce3..f9d87e4b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.553 2014/01/17 08:17:35 dtucker Exp $
+# $Id: configure.ac,v 1.554 2014/01/17 10:54:32 dtucker 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.553 $)
+AC_REVISION($Revision: 1.554 $)
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -134,7 +134,6 @@ AC_ARG_WITH([stackprotect],
 AC_ARG_WITH([hardening],
     [  --without-hardening     Don't use toolchain hardening flags], [
     if test "x$withval" = "xno"; then
-	use_stack_protector=0
 	use_toolchain_hardening=0
     fi ])
 
-- 
cgit v1.2.3