From 8acb3b665bf7f27207ce9694826029165f8c0cd6 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 10 Aug 2007 14:36:12 +1000
Subject: [PATCH]  - (dtucker) [configure.ac] Bug #1343: Set DISABLE_FD_PASSING
 for QNX6. From.    Matt Kraai, ok djm@.

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

diff --git a/ChangeLog b/ChangeLog
index a5cfdea79..5314b2836 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 20070810
  - (dtucker) [auth-pam.c] Use sigdie here too.  ok djm@
+ - (dtucker) [configure.ac] Bug #1343: Set DISABLE_FD_PASSING for QNX6. From 
+   Matt Kraai, ok djm@ 
 
 20070809
  - (dtucker) [openbsd-compat/port-aix.c] Comment typo.
@@ -3145,4 +3147,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.4723 2007/08/10 04:32:34 dtucker Exp $
+$Id: ChangeLog,v 1.4724 2007/08/10 04:36:12 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 689724133..f1052b079 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.382 2007/06/25 12:15:12 dtucker Exp $
+# $Id: configure.ac,v 1.383 2007/08/10 04:36:12 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.382 $)
+AC_REVISION($Revision: 1.383 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -786,6 +786,11 @@ mips-sony-bsd|mips-sony-newsos4)
 	AC_DEFINE(DISABLE_LASTLOG)
 	AC_DEFINE(SSHD_ACQUIRES_CTTY)
 	enable_etc_default_login=no	# has incompatible /etc/default/login
+	case "$host" in
+	*-*-nto-qnx6*)
+		AC_DEFINE(DISABLE_FD_PASSING)
+		;;
+	esac
 	;;
 
 *-*-ultrix*)