diff options
| author | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
| commit | 2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (patch) | |
| tree | f64a4ace625514e94759878c0b94ab0a79805bbd /sshd_config | |
| parent | 3c190ec8e469477ea65fbf4cc83062c65c281434 (diff) | |
| parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) | |
Merge 4.3p2 to the trunk.
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 1440c05ff..4957dd1a6 100644 --- a/sshd_config +++ b/sshd_config | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: sshd_config,v 1.72 2005/07/25 11:59:40 markus Exp $ | 1 | # $OpenBSD: sshd_config,v 1.73 2005/12/06 22:38:28 reyk 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. |
| @@ -96,6 +96,7 @@ | |||
| 96 | #UseDNS yes | 96 | #UseDNS yes |
| 97 | #PidFile /var/run/sshd.pid | 97 | #PidFile /var/run/sshd.pid |
| 98 | #MaxStartups 10 | 98 | #MaxStartups 10 |
| 99 | #PermitTunnel no | ||
| 99 | 100 | ||
| 100 | # no default banner path | 101 | # no default banner path |
| 101 | #Banner /some/path | 102 | #Banner /some/path |