From 608d1d1f9b4e1531cd1124dc0df4d38fa56a0712 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Tue, 5 Jun 2001 19:33:22 +0000 Subject: [PATCH] - markus@cvs.openbsd.org 2001/05/19 16:08:43 [sshd.8] sort options; Matthew.Stier@fnc.fujitsu.com --- ChangeLog | 5 ++++- sshd.8 | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d7799318..ff61de7f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,9 @@ [scp.c] ftruncate() instead of open()+O_TRUNC like rcp.c does allows scp /path/to/file localhost:/path/to/file + - markus@cvs.openbsd.org 2001/05/19 16:08:43 + [sshd.8] + sort options; Matthew.Stier@fnc.fujitsu.com 20010528 - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c @@ -5446,4 +5449,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1230 2001/06/05 19:31:41 mouring Exp $ +$Id: ChangeLog,v 1.1231 2001/06/05 19:33:22 mouring Exp $ diff --git a/sshd.8 b/sshd.8 index ba3151ede..27eb0d6bf 100644 --- a/sshd.8 +++ b/sshd.8 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd.8,v 1.121 2001/05/04 14:21:56 stevesk Exp $ +.\" $OpenBSD: sshd.8,v 1.122 2001/05/19 16:08:43 markus Exp $ .Dd September 25, 1999 .Dt SSHD 8 .Os @@ -347,17 +347,17 @@ Currently there is only support for authentication. The default is .Dq yes . -.It Cm Ciphers -Specifies the ciphers allowed for protocol version 2. -Multiple ciphers must be comma-separated. -The default is -.Dq aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour. .It Cm CheckMail Specifies whether .Nm should check for new mail for interactive logins. The default is .Dq no . +.It Cm Ciphers +Specifies the ciphers allowed for protocol version 2. +Multiple ciphers must be comma-separated. +The default is +.Dq aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour. .It Cm ClientAliveInterval Sets a timeout interval in seconds after which if no data has been received from the client,