- (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.

diff --git a/ChangeLog b/ChangeLog
index ccf6b0f111d3e3fbe5f6cd20de85fff6e33c6f9a..dc3e42f4861ec2a3104df59137ffc3d594748b7b 100644 (file)
--- 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

diff --git a/configure.ac b/configure.ac
index e8c6f871df286042466d601ce4249d7696597d96..b83aed8ea5492becfc446b8fa5b8e6eef2a7a189 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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)

diff --git a/sshd.8 b/sshd.8
index fdff4ac9166d2a20fd9f9c0a69d6ea57fb7cf746..94cefdea21691333201663f54a646f71b22b1dae 100644 (file)
--- 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