From da11f7bb5230cc7bd14f5e317c8d65af3a89274f Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 5 Oct 2005 22:59:08 +1000 Subject: - (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. --- ChangeLog | 7 ++++++- configure.ac | 3 ++- sshd.8 | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29243791..0f6117a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 @@ -3025,4 +3030,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.3887.2.9 2005/10/03 08:23:57 dtucker Exp $ +$Id: ChangeLog,v 1.3887.2.10 2005/10/05 12:59:08 dtucker Exp $ diff --git a/configure.ac b/configure.ac index a01f5445..963253b2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.292.2.1 2005/09/22 10:14:25 dtucker Exp $ +# $Id: configure.ac,v 1.292.2.2 2005/10/05 12:59:09 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -358,6 +358,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) diff --git a/sshd.8 b/sshd.8 index fdff4ac9..f1b7ba14 100644 --- a/sshd.8 +++ b/sshd.8 @@ -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 -- cgit v1.2.3