summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2007-01-05 16:29:30 +1100
committerDamien Miller <djm@mindrot.org>2007-01-05 16:29:30 +1100
commitd94fc72bcdd7d9f5a4f02c165c34ed3ffc12ed2b (patch)
tree6c5f8acb5650aba6a0bd809e179128d911b42d19
parent9fc6a56204d6a1245e79346ed5e714f70c6dc9cc (diff)
- jmc@cvs.openbsd.org 2007/01/02 09:57:25
[sshd_config.5] do not use lists for SYNOPSIS; from eric s. raymond via brad
-rw-r--r--ChangeLog6
-rw-r--r--sshd_config.56
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c893a1d7..1c090460c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,10 @@
25 [servconf.c] 25 [servconf.c]
26 Make "PermitOpen all" first-match within a block to match the way other 26 Make "PermitOpen all" first-match within a block to match the way other
27 options work. ok markus@ djm@ 27 options work. ok markus@ djm@
28 - jmc@cvs.openbsd.org 2007/01/02 09:57:25
29 [sshd_config.5]
30 do not use lists for SYNOPSIS;
31 from eric s. raymond via brad
28 32
2920061205 3320061205
30 - (djm) [auth.c] Fix NULL pointer dereference in fakepw(). Crash would 34 - (djm) [auth.c] Fix NULL pointer dereference in fakepw(). Crash would
@@ -2645,4 +2649,4 @@
2645 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2649 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2646 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2650 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2647 2651
2648$Id: ChangeLog,v 1.4597 2007/01/05 05:29:02 djm Exp $ 2652$Id: ChangeLog,v 1.4598 2007/01/05 05:29:30 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index 2bcaf2245..53207fd84 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd_config.5,v 1.70 2006/08/21 08:14:01 dtucker Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.71 2007/01/02 09:57:25 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -42,9 +42,7 @@
42.Nm sshd_config 42.Nm sshd_config
43.Nd OpenSSH SSH daemon configuration file 43.Nd OpenSSH SSH daemon configuration file
44.Sh SYNOPSIS 44.Sh SYNOPSIS
45.Bl -tag -width Ds -compact 45.Nm /etc/ssh/sshd_config
46.It Pa /etc/ssh/sshd_config
47.El
48.Sh DESCRIPTION 46.Sh DESCRIPTION
49.Xr sshd 8 47.Xr sshd 8
50reads configuration data from 48reads configuration data from