summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sshd.87
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c56c6bd3..299813ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20070817
+ - (dtucker) [sshd.8] Many Linux variants use a single "!" to denote locked
+ accounts and that's what the code looks for, so make man page and code
+ agree. Pointed out by Roumen Petrov.
+
20070816
- (dtucker) [session.c] Call PAM cleanup functions for unauthenticated
connections too. Based on a patch from Sandro Wefel, with & ok djm@
@@ -3173,4 +3178,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4731 2007/08/16 13:28:04 dtucker Exp $
+$Id: ChangeLog,v 1.4732 2007/08/16 23:42:32 dtucker Exp $
diff --git a/sshd.8 b/sshd.8
index 023930e8..66dc7c0e 100644
--- a/sshd.8
+++ b/sshd.8
@@ -35,7 +35,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: sshd.8,v 1.237 2007/06/07 19:37:34 pvalchev Exp $
-.Dd $Mdocdate: June 7 2007 $
+.Dd $Mdocdate: June 11 2007 $
.Dt SSHD 8
.Os
.Sh NAME
@@ -302,8 +302,9 @@ on Tru64,
a leading
.Ql \&*LOCKED\&*
on FreeBSD and a leading
-.Ql \&!!
-on Linux). If there is a requirement to disable password authentication
+.Ql \&!
+on most Linuxes).
+If there is a requirement to disable password authentication
for the account while allowing still public-key, then the passwd field
should be set to something other than these values (eg
.Ql NP