summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-11-06 20:27:51 +1100
committerDamien Miller <djm@mindrot.org>2003-11-06 20:27:51 +1100
commit418a386f2bb62ff03cee5dfc2c8d561aba08d8c1 (patch)
tree6c0c55ac3328d7bc5cf8efcd5dac8ac8be80b356
parentbe8a771af144c1ef09ccc8db0cbfaa57b159a517 (diff)
- (djm) Clarify UsePAM consequences a little more
-rw-r--r--ChangeLog5
-rw-r--r--sshd_config2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ebf64f942..d31002b08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120031106
2 - (djm) Clarify UsePAM consequences a little more
3
120031103 420031103
2 - (dtucker) [contrib/cygwin/ssh-host-config] Ensure entries in /etc/services 5 - (dtucker) [contrib/cygwin/ssh-host-config] Ensure entries in /etc/services
3 are created correctly with CRLF line terminations. Patch from vinschen at 6 are created correctly with CRLF line terminations. Patch from vinschen at
@@ -1394,4 +1397,4 @@
1394 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1397 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1395 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1398 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1396 1399
1397$Id: ChangeLog,v 1.3092 2003/11/03 11:52:52 dtucker Exp $ 1400$Id: ChangeLog,v 1.3093 2003/11/06 09:27:51 djm Exp $
diff --git a/sshd_config b/sshd_config
index 5e026a609..8dfc772e8 100644
--- a/sshd_config
+++ b/sshd_config
@@ -68,7 +68,7 @@
68 68
69# Set this to 'yes' to enable PAM authentication (via challenge-response) 69# Set this to 'yes' to enable PAM authentication (via challenge-response)
70# and session processing. Depending on your PAM configuration, this may 70# and session processing. Depending on your PAM configuration, this may
71# bypass the setting of 'PasswordAuthentication' 71# bypass the setting of 'PasswordAuthentication' and 'PermitEmptyPasswords'
72#UsePAM no 72#UsePAM no
73 73
74#AllowTcpForwarding yes 74#AllowTcpForwarding yes