diff options
author | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:24:29 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:24:29 +0000 |
commit | 796ba4fd011b5d0d9d78d592ba2f30fc9d5ed2e7 (patch) | |
tree | 98105bf1621565a2679d5f7f4d650561be2d7666 /sshd_config.5 | |
parent | 9a975a9faed7c4f334e8c8490db3e77e102f2b21 (diff) | |
parent | 19158b2447e35838d69b2b735fb640d1e86061ea (diff) |
Import openssh_6.6p1.orig.tar.gz
Diffstat (limited to 'sshd_config.5')
-rw-r--r-- | sshd_config.5 | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index 3b21ea6e7..ce71efe3c 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.170 2013/12/08 09:53:27 dtucker Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.172 2014/02/27 22:47:07 djm Exp $ |
37 | .Dd $Mdocdate: December 8 2013 $ | 37 | .Dd $Mdocdate: February 27 2014 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -633,6 +633,17 @@ The default is | |||
633 | for interactive sessions and | 633 | for interactive sessions and |
634 | .Dq throughput | 634 | .Dq throughput |
635 | for non-interactive sessions. | 635 | for non-interactive sessions. |
636 | .It Cm KbdInteractiveAuthentication | ||
637 | Specifies whether to allow keyboard-interactive authentication. | ||
638 | The argument to this keyword must be | ||
639 | .Dq yes | ||
640 | or | ||
641 | .Dq no . | ||
642 | The default is to use whatever value | ||
643 | .Cm ChallengeResponseAuthentication | ||
644 | is set to | ||
645 | (by default | ||
646 | .Dq yes ) . | ||
636 | .It Cm KerberosAuthentication | 647 | .It Cm KerberosAuthentication |
637 | Specifies whether the password provided by the user for | 648 | Specifies whether the password provided by the user for |
638 | .Cm PasswordAuthentication | 649 | .Cm PasswordAuthentication |
@@ -759,6 +770,10 @@ line are satisfied, the keywords on the following lines override those | |||
759 | set in the global section of the config file, until either another | 770 | set in the global section of the config file, until either another |
760 | .Cm Match | 771 | .Cm Match |
761 | line or the end of the file. | 772 | line or the end of the file. |
773 | If a keyword appears in multiple | ||
774 | .Cm Match | ||
775 | blocks that are satisified, only the first instance of the keyword is | ||
776 | applied. | ||
762 | .Pp | 777 | .Pp |
763 | The arguments to | 778 | The arguments to |
764 | .Cm Match | 779 | .Cm Match |