diff options
author | Damien Miller <djm@mindrot.org> | 2000-09-16 13:29:08 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-09-16 13:29:08 +1100 |
commit | e4340be5b3ff16f4d9ba5e3ea7e449dc1b6fa7a8 (patch) | |
tree | aba9e2ae234edeb888b922c6a13b755c1248deea /ssh.1 | |
parent | f384c366d33cb435627743f7ea0ed3f966543d40 (diff) |
- (djm) Merge OpenBSD changes:
- markus@cvs.openbsd.org 2000/09/05 02:59:57
[session.c]
print hostname (not hushlogin)
- markus@cvs.openbsd.org 2000/09/05 13:18:48
[authfile.c ssh-add.c]
enable ssh-add -d for DSA keys
- markus@cvs.openbsd.org 2000/09/05 13:20:49
[sftp-server.c]
cleanup
- markus@cvs.openbsd.org 2000/09/06 03:46:41
[authfile.h]
prototype
- deraadt@cvs.openbsd.org 2000/09/07 14:27:56
[ALL]
cleanup copyright notices on all files. I have attempted to be
accurate with the details. everything is now under Tatu's licence
(which I copied from his readme), and/or the core-sdi bsd-ish thing
for deattack, or various openbsd developers under a 2-term bsd
licence. We're not changing any rules, just being accurate.
- markus@cvs.openbsd.org 2000/09/07 14:40:30
[channels.c channels.h clientloop.c serverloop.c ssh.c]
cleanup window and packet sizes for ssh2 flow control; ok niels
- markus@cvs.openbsd.org 2000/09/07 14:53:00
[scp.c]
typo
- markus@cvs.openbsd.org 2000/09/07 15:13:37
[auth-options.c auth-options.h auth-rh-rsa.c auth-rsa.c auth.c]
[authfile.h canohost.c channels.h compat.c hostfile.h log.c match.h]
[pty.c readconf.c]
some more Copyright fixes
- markus@cvs.openbsd.org 2000/09/08 03:02:51
[README.openssh2]
bye bye
- deraadt@cvs.openbsd.org 2000/09/11 18:38:33
[LICENCE cipher.c]
a few more comments about it being ARC4 not RC4
- markus@cvs.openbsd.org 2000/09/12 14:53:11
[log-client.c log-server.c log.c ssh.1 ssh.c ssh.h sshd.8 sshd.c]
multiple debug levels
- markus@cvs.openbsd.org 2000/09/14 14:25:15
[clientloop.c]
typo
- deraadt@cvs.openbsd.org 2000/09/15 01:13:51
[ssh-agent.c]
check return value for setenv(3) for failure, and deal appropriately
Diffstat (limited to 'ssh.1')
-rw-r--r-- | ssh.1 | 38 |
1 files changed, 32 insertions, 6 deletions
@@ -1,15 +1,38 @@ | |||
1 | .\" -*- nroff -*- | 1 | .\" -*- nroff -*- |
2 | .\" | 2 | .\" |
3 | .\" ssh.1.in | ||
4 | .\" | ||
5 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> |
6 | .\" | ||
7 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
8 | .\" All rights reserved | 5 | .\" All rights reserved |
9 | .\" | 6 | .\" |
10 | .\" Created: Sat Apr 22 21:55:14 1995 ylo | 7 | .\" As far as I am concerned, the code I have written for this software |
8 | .\" can be used freely for any purpose. Any derived versions of this | ||
9 | .\" software must be clearly marked as such, and if the derived work is | ||
10 | .\" incompatible with the protocol description in the RFC file, it must be | ||
11 | .\" called by a name other than "ssh" or "Secure Shell". | ||
12 | .\" | ||
13 | .\" Copyright (c) 1999,2000 Markus Friedl. All rights reserved. | ||
14 | .\" Copyright (c) 1999 Aaron Campbell. All rights reserved. | ||
15 | .\" Copyright (c) 1999 Theo de Raadt. All rights reserved. | ||
16 | .\" | ||
17 | .\" Redistribution and use in source and binary forms, with or without | ||
18 | .\" modification, are permitted provided that the following conditions | ||
19 | .\" are met: | ||
20 | .\" 1. Redistributions of source code must retain the above copyright | ||
21 | .\" notice, this list of conditions and the following disclaimer. | ||
22 | .\" 2. Redistributions in binary form must reproduce the above copyright | ||
23 | .\" notice, this list of conditions and the following disclaimer in the | ||
24 | .\" documentation and/or other materials provided with the distribution. | ||
11 | .\" | 25 | .\" |
12 | .\" $Id: ssh.1,v 1.31 2000/09/05 02:34:54 djm Exp $ | 26 | .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
27 | .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
28 | .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
29 | .\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
30 | .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
31 | .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
32 | .\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
33 | .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
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. | ||
13 | .\" | 36 | .\" |
14 | .Dd September 25, 1999 | 37 | .Dd September 25, 1999 |
15 | .Dt SSH 1 | 38 | .Dt SSH 1 |
@@ -460,6 +483,7 @@ debugging connection, authentication, and configuration problems. | |||
460 | The verbose mode is also used to display | 483 | The verbose mode is also used to display |
461 | .Xr skey 1 | 484 | .Xr skey 1 |
462 | challenges, if the user entered "s/key" as password. | 485 | challenges, if the user entered "s/key" as password. |
486 | Multiple -v options increases the verbosity. Maximum is 3. | ||
463 | .It Fl x | 487 | .It Fl x |
464 | Disables X11 forwarding. | 488 | Disables X11 forwarding. |
465 | .It Fl X | 489 | .It Fl X |
@@ -1202,7 +1226,8 @@ more restrictive licenses, and thus demand for a free version was born. | |||
1202 | This version of OpenSSH | 1226 | This version of OpenSSH |
1203 | .Bl -bullet | 1227 | .Bl -bullet |
1204 | .It | 1228 | .It |
1205 | has all components of a restrictive nature (i.e., patents) | 1229 | has all components of a restrictive nature (i.e., patents, see |
1230 | .Xr crypto 3 ) | ||
1206 | directly removed from the source code; any licensed or patented components | 1231 | directly removed from the source code; any licensed or patented components |
1207 | are chosen from | 1232 | are chosen from |
1208 | external libraries. | 1233 | external libraries. |
@@ -1231,3 +1256,4 @@ The support for SSH protocol 2 was written by Markus Friedl. | |||
1231 | .Xr ssh-keygen 1 , | 1256 | .Xr ssh-keygen 1 , |
1232 | .Xr telnet 1 , | 1257 | .Xr telnet 1 , |
1233 | .Xr sshd 8 , | 1258 | .Xr sshd 8 , |
1259 | .Xr crypto 3 | ||