- (tim) [configure.ac sshd.8] Enable locked account check (a "*LK*" string)

for UnixWare.
This commit is contained in:
Tim Rice 2005-11-28 18:40:34 -08:00
parent 3af2ac56a2
commit 46259d86a2
3 changed files with 8 additions and 3 deletions

View File

@ -5,6 +5,8 @@
- dtucker@cvs.openbsd.org 2005/11/29 02:04:55 - dtucker@cvs.openbsd.org 2005/11/29 02:04:55
[ssh-keygen.c] [ssh-keygen.c]
Populate default key sizes before checking them; from & ok tim@ Populate default key sizes before checking them; from & ok tim@
- (tim) [configure.ac sshd.8] Enable locked account check (a "*LK*" string)
for UnixWare.
20051128 20051128
- (dtucker) [regress/yes-head.sh] Work around breakage caused by some - (dtucker) [regress/yes-head.sh] Work around breakage caused by some
@ -3383,4 +3385,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4014 2005/11/29 02:10:24 dtucker Exp $ $Id: ChangeLog,v 1.4015 2005/11/29 02:40:34 tim Exp $

View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.311 2005/11/26 11:24:10 dtucker Exp $ # $Id: configure.ac,v 1.312 2005/11/29 02:40:34 tim Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -434,6 +434,7 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE(BROKEN_SETREUID) AC_DEFINE(BROKEN_SETREUID)
AC_DEFINE(BROKEN_SETREGID) AC_DEFINE(BROKEN_SETREGID)
AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd]) AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd])
AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
;; ;;
# UnixWare 7.x, OpenUNIX 8 # UnixWare 7.x, OpenUNIX 8
*-*-sysv5*) *-*-sysv5*)
@ -450,6 +451,8 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE(BROKEN_LIBIAF, 1, AC_DEFINE(BROKEN_LIBIAF, 1,
[ia_uinfo routines not supported by OS yet]) [ia_uinfo routines not supported by OS yet])
;; ;;
*) AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
;;
esac esac
;; ;;
*-*-sysv*) *-*-sysv*)

2
sshd.8
View File

@ -119,7 +119,7 @@ or its group is listed in
\&. The definition of a locked account is system dependant. Some platforms \&. The definition of a locked account is system dependant. Some platforms
have their own account database (eg AIX) and some modify the passwd field ( have their own account database (eg AIX) and some modify the passwd field (
.Ql \&*LK\&* .Ql \&*LK\&*
on Solaris, on Solaris and UnixWare,
.Ql \&* .Ql \&*
on HP-UX, containing on HP-UX, containing
.Ql Nologin .Ql Nologin