summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-06-26 23:05:16 +1000
committerDamien Miller <djm@mindrot.org>2002-06-26 23:05:16 +1000
commit136d4418e3366bae92e5f1472a0251efc5e2804c (patch)
treecdaf95fc5285932004da8731efd3586c3d2b47fe
parentf49035a0bbd87a89ded6f029f379f7d655135a66 (diff)
- (djm) Improve PAMAuthenticationViaKbdInt text from Nalin Dahyabhai
<nalin@redhat.com>
-rw-r--r--ChangeLog4
-rw-r--r--sshd_config.510
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e4927d46f..aa6a1c8b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,8 @@
49 [session.c] 49 [session.c]
50 limit # of env vars to 1000; ok deraadt/djm 50 limit # of env vars to 1000; ok deraadt/djm
51 - (djm) Require krb5 devel for RPM build w/ KrbV 51 - (djm) Require krb5 devel for RPM build w/ KrbV
52 - (djm) Improve PAMAuthenticationViaKbdInt text from Nalin Dahyabhai
53 <nalin@redhat.com>
52 54
5320020625 5520020625
54 - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh 56 - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh
@@ -1148,4 +1150,4 @@
1148 - (stevesk) entropy.c: typo in debug message 1150 - (stevesk) entropy.c: typo in debug message
1149 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1151 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1150 1152
1151$Id: ChangeLog,v 1.2294 2002/06/26 09:42:52 djm Exp $ 1153$Id: ChangeLog,v 1.2295 2002/06/26 13:05:16 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index 3e198dfa3..aa7b7c7d4 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -305,10 +305,6 @@ To disable keepalives, the value should be set to
305.It Cm KerberosAuthentication 305.It Cm KerberosAuthentication
306Specifies whether Kerberos authentication is allowed. 306Specifies whether Kerberos authentication is allowed.
307This can be in the form of a Kerberos ticket, or if 307This can be in the form of a Kerberos ticket, or if
308.It Cm PAMAuthenticationViaKbdInt
309Specifies whether PAM challenge response authentication is allowed. This
310allows the use of most PAM challenge response authentication modules, but
311it will allow password authentication regardless of whether
312.Cm PasswordAuthentication 308.Cm PasswordAuthentication
313is yes, the password provided by the user will be validated through 309is yes, the password provided by the user will be validated through
314the Kerberos KDC. 310the Kerberos KDC.
@@ -425,6 +421,12 @@ The probability increases linearly and all connection attempts
425are refused if the number of unauthenticated connections reaches 421are refused if the number of unauthenticated connections reaches
426.Dq full 422.Dq full
427(60). 423(60).
424.It Cm PAMAuthenticationViaKbdInt
425Specifies whether PAM challenge response authentication is allowed. This
426allows the use of most PAM challenge response authentication modules, but
427it will allow password authentication regardless of whether
428.Cm PasswordAuthentication
429is enabled.
428.It Cm PasswordAuthentication 430.It Cm PasswordAuthentication
429Specifies whether password authentication is allowed. 431Specifies whether password authentication is allowed.
430The default is 432The default is