summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-08-10 14:36:12 +1000
committerDarren Tucker <dtucker@zip.com.au>2007-08-10 14:36:12 +1000
commit8acb3b665bf7f27207ce9694826029165f8c0cd6 (patch)
treef1299052494469156fe398f6192e74ef46b035df
parent57d4ca96819651354bdff706df08b3d70a054439 (diff)
- (dtucker) [configure.ac] Bug #1343: Set DISABLE_FD_PASSING for QNX6. From.
Matt Kraai, ok djm@.
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac9
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 @@
120070810 120070810
2 - (dtucker) [auth-pam.c] Use sigdie here too. ok djm@ 2 - (dtucker) [auth-pam.c] Use sigdie here too. ok djm@
3 - (dtucker) [configure.ac] Bug #1343: Set DISABLE_FD_PASSING for QNX6. From
4 Matt Kraai, ok djm@
3 5
420070809 620070809
5 - (dtucker) [openbsd-compat/port-aix.c] Comment typo. 7 - (dtucker) [openbsd-compat/port-aix.c] Comment typo.
@@ -3145,4 +3147,4 @@
3145 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3147 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3146 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3148 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3147 3149
3148$Id: ChangeLog,v 1.4723 2007/08/10 04:32:34 dtucker Exp $ 3150$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 @@
1# $Id: configure.ac,v 1.382 2007/06/25 12:15:12 dtucker Exp $ 1# $Id: configure.ac,v 1.383 2007/08/10 04:36:12 dtucker 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.382 $) 18AC_REVISION($Revision: 1.383 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -786,6 +786,11 @@ mips-sony-bsd|mips-sony-newsos4)
786 AC_DEFINE(DISABLE_LASTLOG) 786 AC_DEFINE(DISABLE_LASTLOG)
787 AC_DEFINE(SSHD_ACQUIRES_CTTY) 787 AC_DEFINE(SSHD_ACQUIRES_CTTY)
788 enable_etc_default_login=no # has incompatible /etc/default/login 788 enable_etc_default_login=no # has incompatible /etc/default/login
789 case "$host" in
790 *-*-nto-qnx6*)
791 AC_DEFINE(DISABLE_FD_PASSING)
792 ;;
793 esac
789 ;; 794 ;;
790 795
791*-*-ultrix*) 796*-*-ultrix*)