summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac12
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fff9e388..da9e201b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
3 [regress/putty-kex.sh regress/putty-transfer.sh] Downgrade disabled 3 [regress/putty-kex.sh regress/putty-transfer.sh] Downgrade disabled
4 interop tests from FATAL error to a warning. Allows some interop 4 interop tests from FATAL error to a warning. Allows some interop
5 tests to proceed if others are missing necessary prerequisites. 5 tests to proceed if others are missing necessary prerequisites.
6 - (djm) [configure.ac] support GNU/kFreeBSD and GNU/kOpensolaris
7 systems; patch from Aurelien Jarno via rmh AT aybabtu.com
6 8
720090214 920090214
8 - (djm) OpenBSD CVS Sync 10 - (djm) OpenBSD CVS Sync
@@ -5169,5 +5171,5 @@
5169 OpenServer 6 and add osr5bigcrypt support so when someone migrates 5171 OpenServer 6 and add osr5bigcrypt support so when someone migrates
5170 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 5172 passwords between UnixWare and OpenServer they will still work. OK dtucker@
5171 5173
5172$Id: ChangeLog,v 1.5196 2009/02/16 04:21:39 djm Exp $ 5174$Id: ChangeLog,v 1.5197 2009/02/16 04:37:03 djm Exp $
5173 5175
diff --git a/configure.ac b/configure.ac
index 242dea0dc..b33914dae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.414 2009/02/12 02:12:22 djm Exp $ 1# $Id: configure.ac,v 1.415 2009/02/16 04:37:03 djm 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.414 $) 18AC_REVISION($Revision: 1.415 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -563,6 +563,14 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
563 AC_DEFINE(WITH_ABBREV_NO_TTY) 563 AC_DEFINE(WITH_ABBREV_NO_TTY)
564 AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") 564 AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
565 ;; 565 ;;
566*-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
567 check_for_libcrypt_later=1
568 AC_DEFINE(PAM_TTY_KLUDGE)
569 AC_DEFINE(LOCKED_PASSWD_PREFIX, "!")
570 AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
571 AC_DEFINE(_PATH_BTMP, "/var/log/btmp", [log for bad login attempts])
572 AC_DEFINE(USE_BTMP, 1, [Use btmp to log bad logins])
573 ;;
566*-*-linux*) 574*-*-linux*)
567 no_dev_ptmx=1 575 no_dev_ptmx=1
568 check_for_libcrypt_later=1 576 check_for_libcrypt_later=1