summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sshd_config4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 57721f8d8..df8249779 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120130918
2 - (dtucker) [sshd_config] Trailing whitespace; from jstjohn at purdue edu.
3
120130914 420130914
2 - (djm) OpenBSD CVS Sync 5 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2013/08/22 19:02:21 6 - djm@cvs.openbsd.org 2013/08/22 19:02:21
diff --git a/sshd_config b/sshd_config
index 8d8eeea34..dbda7491e 100644
--- a/sshd_config
+++ b/sshd_config
@@ -84,8 +84,8 @@ AuthorizedKeysFile .ssh/authorized_keys
84#GSSAPIAuthentication no 84#GSSAPIAuthentication no
85#GSSAPICleanupCredentials yes 85#GSSAPICleanupCredentials yes
86 86
87# Set this to 'yes' to enable PAM authentication, account processing, 87# Set this to 'yes' to enable PAM authentication, account processing,
88# and session processing. If this is enabled, PAM authentication will 88# and session processing. If this is enabled, PAM authentication will
89# be allowed through the ChallengeResponseAuthentication and 89# be allowed through the ChallengeResponseAuthentication and
90# PasswordAuthentication. Depending on your PAM configuration, 90# PasswordAuthentication. Depending on your PAM configuration,
91# PAM authentication via ChallengeResponseAuthentication may bypass 91# PAM authentication via ChallengeResponseAuthentication may bypass