diff options
| author | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
| commit | 0970072c89b079b022538e3c366fbfa2c53fc821 (patch) | |
| tree | b7024712d74234bb5a8b036ccbc9109e2e211296 /sshd_config | |
| parent | 4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 (diff) | |
| parent | 478ff799463ca926a8dfbabf058f4e84aaffc65a (diff) | |
merge 5.7p1
Diffstat (limited to 'sshd_config')
| -rw-r--r-- | sshd_config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sshd_config b/sshd_config index 69ff6b600..3576260a2 100644 --- a/sshd_config +++ b/sshd_config | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: sshd_config,v 1.81 2009/10/08 14:03:41 markus Exp $ | 1 | # $OpenBSD: sshd_config,v 1.82 2010/09/06 17:10:19 naddy 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. |
| @@ -23,6 +23,7 @@ | |||
| 23 | # HostKeys for protocol version 2 | 23 | # HostKeys for protocol version 2 |
| 24 | #HostKey /etc/ssh/ssh_host_rsa_key | 24 | #HostKey /etc/ssh/ssh_host_rsa_key |
| 25 | #HostKey /etc/ssh/ssh_host_dsa_key | 25 | #HostKey /etc/ssh/ssh_host_dsa_key |
| 26 | #HostKey /etc/ssh/ssh_host_ecdsa_key | ||
| 26 | 27 | ||
| 27 | # Lifetime and size of ephemeral version 1 server key | 28 | # Lifetime and size of ephemeral version 1 server key |
| 28 | #KeyRegenerationInterval 1h | 29 | #KeyRegenerationInterval 1h |