summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac3
-rw-r--r--sshd.85
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ab9271ed2..2635f3ed1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120051005
2 - (dtucker) [configure.ac sshd.8] Enable locked account check (a prepended
3 "*LOCKED*" string) for FreeBSD. Patch jeremie at le-hen.org and
4 senthilkumar_sen at hotpop.com.
5
120051003 620051003
2 - (dtucker) OpenBSD CVS Sync 7 - (dtucker) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2005/09/07 08:53:53 8 - markus@cvs.openbsd.org 2005/09/07 08:53:53
@@ -3086,4 +3091,4 @@
3086 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3091 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3087 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3092 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3088 3093
3089$Id: ChangeLog,v 1.3915 2005/10/03 10:14:18 dtucker Exp $ 3094$Id: ChangeLog,v 1.3916 2005/10/05 13:02:16 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index ecbc07291..2b5059a25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.296 2005/09/22 10:19:54 dtucker Exp $ 1# $Id: configure.ac,v 1.297 2005/10/05 13:02:16 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -398,6 +398,7 @@ mips-sony-bsd|mips-sony-newsos4)
398 ;; 398 ;;
399*-*-freebsd*) 399*-*-freebsd*)
400 check_for_libcrypt_later=1 400 check_for_libcrypt_later=1
401 AC_DEFINED(LOCKED_PASSWD_PREFIX, "*LOCKED*")
401 ;; 402 ;;
402*-*-bsdi*) 403*-*-bsdi*)
403 AC_DEFINE(SETEUID_BREAKS_SETUID) 404 AC_DEFINE(SETEUID_BREAKS_SETUID)
diff --git a/sshd.8 b/sshd.8
index fdff4ac91..94cefdea2 100644
--- a/sshd.8
+++ b/sshd.8
@@ -123,7 +123,10 @@ on Solaris,
123.Ql \&* 123.Ql \&*
124on HP-UX, containing 124on HP-UX, containing
125.Ql Nologin 125.Ql Nologin
126on Tru64 and a leading 126on Tru64,
127a leading
128.Ql \&*LOCKED\&*
129on FreeBSD and a leading
127.Ql \&!! 130.Ql \&!!
128on Linux). If there is a requirement to disable password authentication 131on Linux). If there is a requirement to disable password authentication
129for the account while allowing still public-key, then the passwd field 132for the account while allowing still public-key, then the passwd field