diff options
| author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
| commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
| tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /sshd_config | |
| parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
| parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) | |
merge 5.4p1
Diffstat (limited to 'sshd_config')
| -rw-r--r-- | sshd_config | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sshd_config b/sshd_config index e03b3b15f..69ff6b600 100644 --- a/sshd_config +++ b/sshd_config | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: sshd_config,v 1.80 2008/07/02 02:24:18 djm Exp $ | 1 | # $OpenBSD: sshd_config,v 1.81 2009/10/08 14:03:41 markus Exp $ |
| 2 | 2 | ||
| 3 | # This is the sshd server system-wide configuration file. See | 3 | # This is the sshd server system-wide configuration file. See |
| 4 | # sshd_config(5) for more information. | 4 | # sshd_config(5) for more information. |
| @@ -15,10 +15,8 @@ | |||
| 15 | #ListenAddress 0.0.0.0 | 15 | #ListenAddress 0.0.0.0 |
| 16 | #ListenAddress :: | 16 | #ListenAddress :: |
| 17 | 17 | ||
| 18 | # Disable legacy (protocol version 1) support in the server for new | 18 | # The default requires explicit activation of protocol 1 |
| 19 | # installations. In future the default will change to require explicit | 19 | #Protocol 2 |
| 20 | # activation of protocol 1 | ||
| 21 | Protocol 2 | ||
| 22 | 20 | ||
| 23 | # HostKey for protocol version 1 | 21 | # HostKey for protocol version 1 |
| 24 | #HostKey /etc/ssh/ssh_host_key | 22 | #HostKey /etc/ssh/ssh_host_key |