2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index dc3233956..ee86bb7c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20031009
+ - (dtucker) [sshd_config.5] UsePAM defaults to "no".  ok djm@
+
 20031008
  - (dtucker) OpenBSD CVS Sync
    - dtucker@cvs.openbsd.org 2003/10/07 01:47:27
@@ -1311,4 +1314,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3068 2003/10/08 07:52:10 dtucker Exp $
+$Id: ChangeLog,v 1.3069 2003/10/09 04:13:53 dtucker Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index 727fdb12a..b402bbdad 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -613,7 +613,8 @@ If you enable this, you should probably disable
 .Cm PasswordAuthentication .
 If you enable 
 .CM UsePAM
-then you will not be able to run sshd as a non-root user.
+then you will not be able to run sshd as a non-root user.  The default is
+.Dq no .
 .It Cm UsePrivilegeSeparation
 Specifies whether
 .Nm sshd