summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 922b2c649..8013660fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120060905
2 - (dtucker) [configure.ac] s/AC_DEFINES/AC_DEFINE/ spotted by Roumen Petrov.
3
120060904 420060904
2 - (dtucker) [configure.ac] Define BROKEN_UPDWTMP on SCO OSR6 as the native 5 - (dtucker) [configure.ac] Define BROKEN_UPDWTMP on SCO OSR6 as the native
3 updwdtmp seems to generate invalid wtmp entries. From Roger Cornelius, 6 updwdtmp seems to generate invalid wtmp entries. From Roger Cornelius,
@@ -5395,4 +5398,4 @@
5395 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5398 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5396 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5399 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5397 5400
5398$Id: ChangeLog,v 1.4529 2006/09/04 12:37:41 dtucker Exp $ 5401$Id: ChangeLog,v 1.4530 2006/09/04 21:53:38 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 32ecd0da8..ce51b4cd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.359 2006/09/04 12:37:42 dtucker Exp $ 1# $Id: configure.ac,v 1.360 2006/09/04 21:53:38 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.359 $) 18AC_REVISION($Revision: 1.360 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -512,7 +512,7 @@ mips-sony-bsd|mips-sony-newsos4)
512 TEST_SHELL=/u95/bin/sh 512 TEST_SHELL=/u95/bin/sh
513 AC_DEFINE(BROKEN_LIBIAF, 1, 513 AC_DEFINE(BROKEN_LIBIAF, 1,
514 [ia_uinfo routines not supported by OS yet]) 514 [ia_uinfo routines not supported by OS yet])
515 AC_DEFINES(BROKEN_UPDWTMP, 1, 515 AC_DEFINE(BROKEN_UPDWTMP, 1,
516 [using updwtmp will corrupt wtmp entries]) 516 [using updwtmp will corrupt wtmp entries])
517 ;; 517 ;;
518 *) AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") 518 *) AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")