summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 11:57:25 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 11:57:25 +1100
commitf4f22b54c0e2a454d3ac093d99f845db4da98a81 (patch)
tree1a34dd3daad251d34ab61510d71a18bc174ffa34
parent5b0d63f8943dc7f9029ba5171b2a23acfa97f7aa (diff)
- jmc@cvs.openbsd.org 2006/02/24 23:51:17
[sshd_config.5] oops - bits i missed;
-rw-r--r--ChangeLog5
-rw-r--r--sshd_config.519
2 files changed, 13 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 18298750c..4d21aae76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -175,6 +175,9 @@
175 - jmc@cvs.openbsd.org 2006/02/24 23:43:57 175 - jmc@cvs.openbsd.org 2006/02/24 23:43:57
176 [sshd_config.5] 176 [sshd_config.5]
177 some grammar/wording fixes; 177 some grammar/wording fixes;
178 - jmc@cvs.openbsd.org 2006/02/24 23:51:17
179 [sshd_config.5]
180 oops - bits i missed;
178 181
17920060313 18220060313
180 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 183 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4076,4 +4079,4 @@
4076 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4079 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4077 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4080 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4078 4081
4079$Id: ChangeLog,v 1.4189 2006/03/15 00:56:56 djm Exp $ 4082$Id: ChangeLog,v 1.4190 2006/03/15 00:57:25 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index 6f60d7e84..8c714444b 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.52 2006/02/24 23:43:57 jmc Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.53 2006/02/24 23:51:17 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
@@ -46,7 +46,7 @@
46.It Pa /etc/ssh/sshd_config 46.It Pa /etc/ssh/sshd_config
47.El 47.El
48.Sh DESCRIPTION 48.Sh DESCRIPTION
49.Nm sshd 49.Xr sshd 8
50reads configuration data from 50reads configuration data from
51.Pa /etc/ssh/sshd_config 51.Pa /etc/ssh/sshd_config
52(or the file specified with 52(or the file specified with
@@ -85,7 +85,7 @@ For this reason, care should be taken in the use of this directive.
85The default is not to accept any environment variables. 85The default is not to accept any environment variables.
86.It Cm AddressFamily 86.It Cm AddressFamily
87Specifies which address family should be used by 87Specifies which address family should be used by
88.Nm sshd . 88.Xr sshd 8 .
89Valid arguments are 89Valid arguments are
90.Dq any , 90.Dq any ,
91.Dq inet 91.Dq inet
@@ -421,7 +421,7 @@ If the value is 0, there is no time limit.
421The default is 120 seconds. 421The default is 120 seconds.
422.It Cm LogLevel 422.It Cm LogLevel
423Gives the verbosity level that is used when logging messages from 423Gives the verbosity level that is used when logging messages from
424.Nm sshd . 424.Xr sshd 8 .
425The possible values are: 425The possible values are:
426QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3. 426QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3.
427The default is INFO. 427The default is INFO.
@@ -453,7 +453,7 @@ Alternatively, random early drop can be enabled by specifying
453the three colon separated values 453the three colon separated values
454.Dq start:rate:full 454.Dq start:rate:full
455(e.g. "10:30:60"). 455(e.g. "10:30:60").
456.Nm sshd 456.Xr sshd 8
457will refuse connection attempts with a probability of 457will refuse connection attempts with a probability of
458.Dq rate/100 458.Dq rate/100
459(30%) 459(30%)
@@ -531,8 +531,7 @@ restrictions in some configurations using mechanisms such as
531.Ev LD_PRELOAD . 531.Ev LD_PRELOAD .
532.It Cm PidFile 532.It Cm PidFile
533Specifies the file that contains the process ID of the 533Specifies the file that contains the process ID of the
534.Nm sshd 534SSH daemon.
535daemon.
536The default is 535The default is
537.Pa /var/run/sshd.pid . 536.Pa /var/run/sshd.pid .
538.It Cm Port 537.It Cm Port
@@ -620,7 +619,7 @@ By default no subsystems are defined.
620Note that this option applies to protocol version 2 only. 619Note that this option applies to protocol version 2 only.
621.It Cm SyslogFacility 620.It Cm SyslogFacility
622Gives the facility code that is used when logging messages from 621Gives the facility code that is used when logging messages from
623.Nm sshd . 622.Xr sshd 8 .
624The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2, 623The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2,
625LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7. 624LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
626The default is AUTH. 625The default is AUTH.
@@ -780,7 +779,7 @@ The default is
780.Pa /usr/X11R6/bin/xauth . 779.Pa /usr/X11R6/bin/xauth .
781.El 780.El
782.Ss Time Formats 781.Ss Time Formats
783.Nm sshd 782.Xr sshd 8
784command-line arguments and configuration file options that specify time 783command-line arguments and configuration file options that specify time
785may be expressed using a sequence of the form: 784may be expressed using a sequence of the form:
786.Sm off 785.Sm off
@@ -824,7 +823,7 @@ Time format examples:
824.Bl -tag -width Ds 823.Bl -tag -width Ds
825.It Pa /etc/ssh/sshd_config 824.It Pa /etc/ssh/sshd_config
826Contains configuration data for 825Contains configuration data for
827.Nm sshd . 826.Xr sshd 8 .
828This file should be writable by root only, but it is recommended 827This file should be writable by root only, but it is recommended
829(though not necessary) that it be world-readable. 828(though not necessary) that it be world-readable.
830.El 829.El