summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--configure.ac5
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 @@
12006023 120060226
2 - (dtucker) [configure.ac] Bug #1156: QNX apparently needs SSHD_ACQUIRES_CTTY
3 patch from kraai at ftbfs.org.
4
520060223
2 - (dtucker) [sshd_config sshd_config.5] Update UsePAM to reflect current 6 - (dtucker) [sshd_config sshd_config.5] Update UsePAM to reflect current
3 reality. Pointed out by tryponraj at gmail.com. 7 reality. Pointed out by tryponraj at gmail.com.
4 8
52006022 920060222
6 - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Minor tidy up: only 10 - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Minor tidy up: only
7 compile in compat code if required. 11 compile in compat code if required.
8 12
@@ -3881,4 +3885,4 @@
3881 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3885 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3882 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3886 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3883 3887
3884$Id: ChangeLog,v 1.4134 2006/02/23 10:35:30 dtucker Exp $ 3888$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 @@
1# $Id: configure.ac,v 1.331 2006/02/20 09:17:36 dtucker Exp $ 1# $Id: configure.ac,v 1.332 2006/02/26 01:31:49 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.331 $) 18AC_REVISION($Revision: 1.332 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -584,6 +584,7 @@ mips-sony-bsd|mips-sony-newsos4)
584 AC_DEFINE(MISSING_HOWMANY, 1, [Define on *nto-qnx systems]) 584 AC_DEFINE(MISSING_HOWMANY, 1, [Define on *nto-qnx systems])
585 AC_DEFINE(MISSING_FD_MASK, 1, [Define on *nto-qnx systems]) 585 AC_DEFINE(MISSING_FD_MASK, 1, [Define on *nto-qnx systems])
586 AC_DEFINE(DISABLE_LASTLOG) 586 AC_DEFINE(DISABLE_LASTLOG)
587 AC_DEFINE(SSHD_ACQUIRES_CTTY)
587 enable_etc_default_login=no # has incompatible /etc/default/login 588 enable_etc_default_login=no # has incompatible /etc/default/login
588 ;; 589 ;;
589 590