summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-15 08:36:02 +1000
committerDamien Miller <djm@mindrot.org>2011-05-15 08:36:02 +1000
commitfd53abd00bf1708c401f3de3d62e9d8ca635e4d3 (patch)
tree571cec40517860bbf0e6e25c02fea547073559df
parent60432d8cf250e2176f50fd486342612a822d70e3 (diff)
- dtucker@cvs.openbsd.org 2011/05/06 01:03:35
[sshd_config] clarify language about overriding defaults. bz#1892, from Petr Cerny
-rw-r--r--ChangeLog3
-rw-r--r--sshd_config4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d3b12b425..5201e5a2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 [mux.c] 4 [mux.c]
5 gracefully fall back when ControlPath is too large for a 5 gracefully fall back when ControlPath is too large for a
6 sockaddr_un. ok markus@ as part of a larger diff 6 sockaddr_un. ok markus@ as part of a larger diff
7 - dtucker@cvs.openbsd.org 2011/05/06 01:03:35
8 [sshd_config]
9 clarify language about overriding defaults. bz#1892, from Petr Cerny
7 10
820110510 1120110510
9 - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix 12 - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix
diff --git a/sshd_config b/sshd_config
index 4534841c1..9b0d9fa20 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
1# $OpenBSD: sshd_config,v 1.82 2010/09/06 17:10:19 naddy Exp $ 1# $OpenBSD: sshd_config,v 1.83 2011/05/06 01:03:35 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.
@@ -7,7 +7,7 @@
7 7
8# The strategy used for options in the default sshd_config shipped with 8# The strategy used for options in the default sshd_config shipped with
9# OpenSSH is to specify options with their default value where 9# OpenSSH is to specify options with their default value where
10# possible, but leave them commented. Uncommented options change a 10# possible, but leave them commented. Uncommented options override the
11# default value. 11# default value.
12 12
13#Port 22 13#Port 22