summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac7
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b4340de78..bbbd985d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
4 Magnus Abrante; suggestion and feedback dtucker@ 4 Magnus Abrante; suggestion and feedback dtucker@
5 NB. this change will require that the privilege separation user must 5 NB. this change will require that the privilege separation user must
6 exist on all the time, not just when UsePrivilegeSeparation=yes 6 exist on all the time, not just when UsePrivilegeSeparation=yes
7 - (tim) [configure.ac] s/BROKEN_UPDWTMP/BROKEN_UPDWTMPX/ on SCO OSR6
7 8
820060905 920060905
9 - (dtucker) [configure.ac] s/AC_DEFINES/AC_DEFINE/ spotted by Roumen Petrov. 10 - (dtucker) [configure.ac] s/AC_DEFINES/AC_DEFINE/ spotted by Roumen Petrov.
@@ -5406,4 +5407,4 @@
5406 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5407 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5407 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5408 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5408 5409
5409$Id: ChangeLog,v 1.4532 2006/09/07 00:36:43 djm Exp $ 5410$Id: ChangeLog,v 1.4533 2006/09/07 01:11:29 tim Exp $
diff --git a/configure.ac b/configure.ac
index ce51b4cd5..493409f4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.360 2006/09/04 21:53:38 dtucker Exp $ 1# $Id: configure.ac,v 1.361 2006/09/07 01:11:29 tim 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.360 $) 18AC_REVISION($Revision: 1.361 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -512,8 +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_DEFINE(BROKEN_UPDWTMP, 1, 515 AC_DEFINE(BROKEN_UPDWTMPX)
516 [using updwtmp will corrupt wtmp entries])
517 ;; 516 ;;
518 *) AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") 517 *) AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
519 ;; 518 ;;