diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd.8 | 12 |
2 files changed, 10 insertions, 7 deletions
@@ -16,6 +16,9 @@ | |||
16 | [scp.c] | 16 | [scp.c] |
17 | ftruncate() instead of open()+O_TRUNC like rcp.c does | 17 | ftruncate() instead of open()+O_TRUNC like rcp.c does |
18 | allows scp /path/to/file localhost:/path/to/file | 18 | allows scp /path/to/file localhost:/path/to/file |
19 | - markus@cvs.openbsd.org 2001/05/19 16:08:43 | ||
20 | [sshd.8] | ||
21 | sort options; Matthew.Stier@fnc.fujitsu.com | ||
19 | 22 | ||
20 | 20010528 | 23 | 20010528 |
21 | - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c | 24 | - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c |
@@ -5446,4 +5449,4 @@ | |||
5446 | - Wrote replacements for strlcpy and mkdtemp | 5449 | - Wrote replacements for strlcpy and mkdtemp |
5447 | - Released 1.0pre1 | 5450 | - Released 1.0pre1 |
5448 | 5451 | ||
5449 | $Id: ChangeLog,v 1.1230 2001/06/05 19:31:41 mouring Exp $ | 5452 | $Id: ChangeLog,v 1.1231 2001/06/05 19:33:22 mouring Exp $ |
@@ -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.8,v 1.121 2001/05/04 14:21:56 stevesk Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.122 2001/05/19 16:08:43 markus Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -347,17 +347,17 @@ Currently there is only support for | |||
347 | authentication. | 347 | authentication. |
348 | The default is | 348 | The default is |
349 | .Dq yes . | 349 | .Dq yes . |
350 | .It Cm Ciphers | ||
351 | Specifies the ciphers allowed for protocol version 2. | ||
352 | Multiple ciphers must be comma-separated. | ||
353 | The default is | ||
354 | .Dq aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour. | ||
355 | .It Cm CheckMail | 350 | .It Cm CheckMail |
356 | Specifies whether | 351 | Specifies whether |
357 | .Nm | 352 | .Nm |
358 | should check for new mail for interactive logins. | 353 | should check for new mail for interactive logins. |
359 | The default is | 354 | The default is |
360 | .Dq no . | 355 | .Dq no . |
356 | .It Cm Ciphers | ||
357 | Specifies the ciphers allowed for protocol version 2. | ||
358 | Multiple ciphers must be comma-separated. | ||
359 | The default is | ||
360 | .Dq aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour. | ||
361 | .It Cm ClientAliveInterval | 361 | .It Cm ClientAliveInterval |
362 | Sets a timeout interval in seconds after which if no data has been received | 362 | Sets a timeout interval in seconds after which if no data has been received |
363 | from the client, | 363 | from the client, |