diff options
| author | Colin Watson <cjwatson@debian.org> | 2013-09-14 15:43:03 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 15:43:03 +0100 |
| commit | 8faf8c84430cf3c19705b1d9f8889d256e7fd1fd (patch) | |
| tree | e6cb74192adb00fda5e4d1457547851d7e0d86af /sshd_config | |
| parent | 328b60656f29db6306994d7498dede386ec2d1c3 (diff) | |
| parent | c41345ad7ee5a22689e2c009595e85fa27b4b39a (diff) | |
merge 6.3p1
Diffstat (limited to 'sshd_config')
| -rw-r--r-- | sshd_config | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sshd_config b/sshd_config index 1af2afd7a..945014124 100644 --- a/sshd_config +++ b/sshd_config | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: sshd_config,v 1.89 2013/02/06 00:20:42 dtucker Exp $ | 1 | # $OpenBSD: sshd_config,v 1.90 2013/05/16 04:09:14 dtucker 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. |
| @@ -29,6 +29,9 @@ | |||
| 29 | #KeyRegenerationInterval 1h | 29 | #KeyRegenerationInterval 1h |
| 30 | #ServerKeyBits 1024 | 30 | #ServerKeyBits 1024 |
| 31 | 31 | ||
| 32 | # Ciphers and keying | ||
| 33 | #RekeyLimit default none | ||
| 34 | |||
| 32 | # Logging | 35 | # Logging |
| 33 | # obsoletes QuietMode and FascistLogging | 36 | # obsoletes QuietMode and FascistLogging |
| 34 | #SyslogFacility AUTH | 37 | #SyslogFacility AUTH |