summaryrefslogtreecommitdiff
path: root/sshd_config
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-05-25 11:01:01 +0000
committerColin Watson <cjwatson@debian.org>2005-05-25 11:01:01 +0000
commite88de75a1a236779a10e8ccbcc51d25308be8840 (patch)
tree7495477a2a7d0cac17a9fcded020b6ea816182ef /sshd_config
parent30a0f9443782cd9d7308acd09430bf586186aa55 (diff)
parent5d05471f6657646d1d6500c7c43134462c407ee6 (diff)
Merge 4.0p1 to the trunk.
Diffstat (limited to 'sshd_config')
-rw-r--r--sshd_config3
1 files changed, 2 insertions, 1 deletions
diff --git a/sshd_config b/sshd_config
index 65e6f1c32..53ae9942e 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
1# $OpenBSD: sshd_config,v 1.69 2004/05/23 23:59:53 dtucker Exp $ 1# $OpenBSD: sshd_config,v 1.70 2004/12/23 23:11:00 djm 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.
@@ -12,6 +12,7 @@
12 12
13#Port 22 13#Port 22
14#Protocol 2,1 14#Protocol 2,1
15#AddressFamily any
15#ListenAddress 0.0.0.0 16#ListenAddress 0.0.0.0
16#ListenAddress :: 17#ListenAddress ::
17 18