diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | sshd.8 | 5 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,8 @@ +20051005 + - (dtucker) [configure.ac sshd.8] Enable locked account check (a prepended + "*LOCKED*" string) for FreeBSD. Patch jeremie at le-hen.org and + senthilkumar_sen at hotpop.com. + 20051003 - (dtucker) OpenBSD CVS Sync - markus@cvs.openbsd.org 2005/09/07 08:53:53 @@ -3086,4 +3091,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3915 2005/10/03 10:14:18 dtucker Exp $ +$Id: ChangeLog,v 1.3916 2005/10/05 13:02:16 dtucker Exp $ diff --git a/configure.ac b/configure.ac index ecbc0729..2b5059a2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.296 2005/09/22 10:19:54 dtucker Exp $ +# $Id: configure.ac,v 1.297 2005/10/05 13:02:16 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -398,6 +398,7 @@ mips-sony-bsd|mips-sony-newsos4) ;; *-*-freebsd*) check_for_libcrypt_later=1 + AC_DEFINED(LOCKED_PASSWD_PREFIX, "*LOCKED*") ;; *-*-bsdi*) AC_DEFINE(SETEUID_BREAKS_SETUID) @@ -123,7 +123,10 @@ on Solaris, .Ql \&* on HP-UX, containing .Ql Nologin -on Tru64 and a leading +on Tru64, +a leading +.Ql \&*LOCKED\&* +on FreeBSD and a leading .Ql \&!! on Linux). If there is a requirement to disable password authentication for the account while allowing still public-key, then the passwd field |