summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sshd_config.54
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c497cf8f0..7712628cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120040412
2 - (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning
3 from bug #701 (text from jfh at cise.ufl.edu).
4
120040408 520040408
2 - (dtucker) [loginrec.c] Use UT_LINESIZE if available, prevents truncating 6 - (dtucker) [loginrec.c] Use UT_LINESIZE if available, prevents truncating
3 pty name on Linux 2.6.x systems. Patch from jpe at eisenmenger.org. 7 pty name on Linux 2.6.x systems. Patch from jpe at eisenmenger.org.
@@ -957,4 +961,4 @@
957 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 961 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
958 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 962 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
959 963
960$Id: ChangeLog,v 1.3307 2004/04/08 16:12:30 mouring Exp $ 964$Id: ChangeLog,v 1.3308 2004/04/14 03:04:35 dtucker Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index a8c865775..e15a225f2 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -434,7 +434,9 @@ The default is
434.Pp 434.Pp
435If this option is set to 435If this option is set to
436.Dq without-password 436.Dq without-password
437password authentication is disabled for root. 437password authentication is disabled for root. Note that other authentication
438methods (e.g., keyboard-interactive/PAM) may still allow root to login using
439a password.
438.Pp 440.Pp
439If this option is set to 441If this option is set to
440.Dq forced-commands-only 442.Dq forced-commands-only