2 files changed, 10 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index d7213862f..09d74de42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
-2006023
+20060226
+ - (dtucker) [configure.ac] Bug #1156: QNX apparently needs SSHD_ACQUIRES_CTTY
+   patch from kraai at ftbfs.org.
+
+20060223
  - (dtucker) [sshd_config sshd_config.5] Update UsePAM to reflect current
    reality.  Pointed out by tryponraj at gmail.com.
 
-2006022
+20060222
  - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Minor tidy up: only
    compile in compat code if required.
 
@@ -3881,4 +3885,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4134 2006/02/23 10:35:30 dtucker Exp $
+$Id: ChangeLog,v 1.4135 2006/02/26 01:31:48 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index eb24fa00e..0781d59fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.331 2006/02/20 09:17:36 dtucker Exp $
+# $Id: configure.ac,v 1.332 2006/02/26 01:31:49 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.331 $)
+AC_REVISION($Revision: 1.332 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -584,6 +584,7 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE(MISSING_HOWMANY, 1, [Define on *nto-qnx systems])
         AC_DEFINE(MISSING_FD_MASK, 1, [Define on *nto-qnx systems])
         AC_DEFINE(DISABLE_LASTLOG)
+        AC_DEFINE(SSHD_ACQUIRES_CTTY)
         enable_etc_default_login=no     # has incompatible /etc/default/login
         ;;