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 @@
+20040412
+ - (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning
+   from bug #701 (text from jfh at cise.ufl.edu).
+
 20040408
  - (dtucker) [loginrec.c] Use UT_LINESIZE if available, prevents truncating
    pty name on Linux 2.6.x systems.  Patch from jpe at eisenmenger.org.
@@ -957,4 +961,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.3307 2004/04/08 16:12:30 mouring Exp $
+$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
 .Pp
 If this option is set to
 .Dq without-password
-password authentication is disabled for root.
+password authentication is disabled for root.  Note that other authentication
+methods (e.g., keyboard-interactive/PAM) may still allow root to login using
+a password.
 .Pp
 If this option is set to
 .Dq forced-commands-only