summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd_config.520
2 files changed, 14 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 15d1a7490..75d2ee5b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,9 @@
56 - markus@cvs.openbsd.org 2005/05/16 15:30:51 56 - markus@cvs.openbsd.org 2005/05/16 15:30:51
57 [readconf.c servconf.c] 57 [readconf.c servconf.c]
58 check return value from strdelim() for NULL (AddressFamily); mpech 58 check return value from strdelim() for NULL (AddressFamily); mpech
59 - djm@cvs.openbsd.org 2005/05/19 02:39:55
60 [sshd_config.5]
61 sort config options, from grunk AT pestilenz.org; ok jmc@
59 62
6020050524 6320050524
61 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] 64 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@@ -2555,4 +2558,4 @@
2555 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2558 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2556 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2559 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2557 2560
2558$Id: ChangeLog,v 1.3777 2005/05/26 02:11:56 djm Exp $ 2561$Id: ChangeLog,v 1.3778 2005/05/26 02:12:19 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index df51fb867..70d18ab0f 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.41 2005/04/21 06:17:50 djm Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.42 2005/05/19 02:39:55 djm 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
@@ -177,15 +177,6 @@ The default is
177 ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, 177 ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,
178 aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr'' 178 aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr''
179.Ed 179.Ed
180.It Cm ClientAliveInterval
181Sets a timeout interval in seconds after which if no data has been received
182from the client,
183.Nm sshd
184will send a message through the encrypted
185channel to request a response from the client.
186The default
187is 0, indicating that these messages will not be sent to the client.
188This option applies to protocol version 2 only.
189.It Cm ClientAliveCountMax 180.It Cm ClientAliveCountMax
190Sets the number of client alive messages (see above) which may be 181Sets the number of client alive messages (see above) which may be
191sent without 182sent without
@@ -213,6 +204,15 @@ If
213.Cm ClientAliveCountMax 204.Cm ClientAliveCountMax
214is left at the default, unresponsive ssh clients 205is left at the default, unresponsive ssh clients
215will be disconnected after approximately 45 seconds. 206will be disconnected after approximately 45 seconds.
207.It Cm ClientAliveInterval
208Sets a timeout interval in seconds after which if no data has been received
209from the client,
210.Nm sshd
211will send a message through the encrypted
212channel to request a response from the client.
213The default
214is 0, indicating that these messages will not be sent to the client.
215This option applies to protocol version 2 only.
216.It Cm Compression 216.It Cm Compression
217Specifies whether compression is allowed. 217Specifies whether compression is allowed.
218The argument must be 218The argument must be