diff options
author | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:32:39 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:34:16 +0000 |
commit | 2ee2de47fd0f684f54218d31b4ec83930e69c18e (patch) | |
tree | 86848a7668424b392d48791a0e41e05f9df7b62b /sshd_config.0 | |
parent | c9947303ad3c432b1cadfbeb1d95a7cd38662d66 (diff) | |
parent | 9cbb60f5e4932634db04c330c88abc49cc5567bd (diff) |
Merge 6.6p1.
* New upstream release (http://www.openssh.com/txt/release-6.6).
Diffstat (limited to 'sshd_config.0')
-rw-r--r-- | sshd_config.0 | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sshd_config.0 b/sshd_config.0 index 5962b02b9..413c26008 100644 --- a/sshd_config.0 +++ b/sshd_config.0 | |||
@@ -374,6 +374,12 @@ DESCRIPTION | |||
374 | interactive sessions and ``throughput'' for non-interactive | 374 | interactive sessions and ``throughput'' for non-interactive |
375 | sessions. | 375 | sessions. |
376 | 376 | ||
377 | KbdInteractiveAuthentication | ||
378 | Specifies whether to allow keyboard-interactive authentication. | ||
379 | The argument to this keyword must be ``yes'' or ``no''. The | ||
380 | default is to use whatever value ChallengeResponseAuthentication | ||
381 | is set to (by default ``yes''). | ||
382 | |||
377 | KerberosAuthentication | 383 | KerberosAuthentication |
378 | Specifies whether the password provided by the user for | 384 | Specifies whether the password provided by the user for |
379 | PasswordAuthentication will be validated through the Kerberos | 385 | PasswordAuthentication will be validated through the Kerberos |
@@ -460,7 +466,9 @@ DESCRIPTION | |||
460 | Match Introduces a conditional block. If all of the criteria on the | 466 | Match Introduces a conditional block. If all of the criteria on the |
461 | Match line are satisfied, the keywords on the following lines | 467 | Match line are satisfied, the keywords on the following lines |
462 | override those set in the global section of the config file, | 468 | override those set in the global section of the config file, |
463 | until either another Match line or the end of the file. | 469 | until either another Match line or the end of the file. If a |
470 | keyword appears in multiple Match blocks that are satisified, | ||
471 | only the first instance of the keyword is applied. | ||
464 | 472 | ||
465 | The arguments to Match are one or more criteria-pattern pairs or | 473 | The arguments to Match are one or more criteria-pattern pairs or |
466 | the single token All which matches all criteria. The available | 474 | the single token All which matches all criteria. The available |
@@ -824,4 +832,4 @@ AUTHORS | |||
824 | versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support | 832 | versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support |
825 | for privilege separation. | 833 | for privilege separation. |
826 | 834 | ||
827 | OpenBSD 5.4 December 8, 2013 OpenBSD 5.4 | 835 | OpenBSD 5.5 February 27, 2014 OpenBSD 5.5 |