summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-29 00:27:11 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-29 00:27:11 +0000
commit89b0bd66e21f3af300c3df4e0e7ff2ecbda933c0 (patch)
tree6677187e5b8dfd18173262c493f5a237bb3e753e
parentb68af624a9bf64fcf810a16a35749f4047ebe1ef (diff)
- stevesk@cvs.openbsd.org 2001/03/26 15:47:59
[ssh.1] document more defaults; misc. cleanup. ok markus@
-rw-r--r--ChangeLog8
-rw-r--r--ssh.126
2 files changed, 29 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e138e87f..8b6bf3987 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120010329
2 - OpenBSD CVS Sync
3 - stevesk@cvs.openbsd.org 2001/03/26 15:47:59
4 [ssh.1]
5 document more defaults; misc. cleanup. ok markus@
6
120010328 720010328
2 - (djm) Reorder tests and library inclusion for Krb4/AFS to try to 8 - (djm) Reorder tests and library inclusion for Krb4/AFS to try to
3 resolve linking conflicts with libcrypto. Report and suggested fix 9 resolve linking conflicts with libcrypto. Report and suggested fix
@@ -4735,4 +4741,4 @@
4735 - Wrote replacements for strlcpy and mkdtemp 4741 - Wrote replacements for strlcpy and mkdtemp
4736 - Released 1.0pre1 4742 - Released 1.0pre1
4737 4743
4738$Id: ChangeLog,v 1.1025 2001/03/28 11:05:26 djm Exp $ 4744$Id: ChangeLog,v 1.1026 2001/03/29 00:27:11 mouring Exp $
diff --git a/ssh.1 b/ssh.1
index 8a9fb653d..e83f618fd 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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: ssh.1,v 1.99 2001/03/19 12:49:51 djm Exp $ 37.\" $OpenBSD: ssh.1,v 1.100 2001/03/26 15:47:59 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -640,16 +640,20 @@ The argument must be
640.Dq yes 640.Dq yes
641or 641or
642.Dq no . 642.Dq no .
643The default is
644.Dq no .
643.It Cm CheckHostIP 645.It Cm CheckHostIP
644If this flag is set to 646If this flag is set to
645.Dq yes , 647.Dq yes ,
646ssh will additionally check the host ip address in the 648ssh will additionally check the host IP address in the
647.Pa known_hosts 649.Pa known_hosts
648file. 650file.
649This allows ssh to detect if a host key changed due to DNS spoofing. 651This allows ssh to detect if a host key changed due to DNS spoofing.
650If the option is set to 652If the option is set to
651.Dq no , 653.Dq no ,
652the check will not be executed. 654the check will not be executed.
655The default is
656.Dq yes .
653.It Cm Cipher 657.It Cm Cipher
654Specifies the cipher to use for encrypting the session 658Specifies the cipher to use for encrypting the session
655in protocol version 1. 659in protocol version 1.
@@ -677,8 +681,10 @@ The argument must be
677.Dq yes 681.Dq yes
678or 682or
679.Dq no . 683.Dq no .
684The default is
685.Dq no .
680.It Cm CompressionLevel 686.It Cm CompressionLevel
681Specifies the compression level to use if compression is enable. 687Specifies the compression level to use if compression is enabled.
682The argument must be an integer from 1 (fast) to 9 (slow, best). 688The argument must be an integer from 1 (fast) to 9 (slow, best).
683The default level is 6, which is good for most applications. 689The default level is 6, which is good for most applications.
684The meaning of the values is the same as in 690The meaning of the values is the same as in
@@ -688,12 +694,15 @@ Specifies the number of tries (one per second) to make before falling
688back to rsh or exiting. 694back to rsh or exiting.
689The argument must be an integer. 695The argument must be an integer.
690This may be useful in scripts if the connection sometimes fails. 696This may be useful in scripts if the connection sometimes fails.
697The default is 4.
691.It Cm PubkeyAuthentication 698.It Cm PubkeyAuthentication
692Specifies whether to try public key authentication. 699Specifies whether to try public key authentication.
693The argument to this keyword must be 700The argument to this keyword must be
694.Dq yes 701.Dq yes
695or 702or
696.Dq no . 703.Dq no .
704The default is
705.Dq yes .
697Note that this option applies to protocol version 2 only. 706Note that this option applies to protocol version 2 only.
698.It Cm EscapeChar 707.It Cm EscapeChar
699Sets the escape character (default: 708Sets the escape character (default:
@@ -720,6 +729,8 @@ The argument must be
720.Dq yes 729.Dq yes
721or 730or
722.Dq no . 731.Dq no .
732The default is
733.Dq no .
723.It Cm ForwardAgent 734.It Cm ForwardAgent
724Specifies whether the connection to the authentication agent (if any) 735Specifies whether the connection to the authentication agent (if any)
725will be forwarded to the remote machine. 736will be forwarded to the remote machine.
@@ -849,6 +860,8 @@ The argument to this keyword must be
849.Dq yes 860.Dq yes
850or 861or
851.Dq no . 862.Dq no .
863The default is
864.Dq yes .
852Note that this option applies to both protocol version 1 and 2. 865Note that this option applies to both protocol version 1 and 2.
853.It Cm Port 866.It Cm Port
854Specifies the port number to connect on the remote host. 867Specifies the port number to connect on the remote host.
@@ -923,14 +936,17 @@ The argument to this keyword must be
923.Dq yes 936.Dq yes
924or 937or
925.Dq no . 938.Dq no .
939The default is
940.Dq yes .
926.It Cm RhostsRSAAuthentication 941.It Cm RhostsRSAAuthentication
927Specifies whether to try rhosts based authentication with RSA host 942Specifies whether to try rhosts based authentication with RSA host
928authentication. 943authentication.
929This is the primary authentication method for most sites.
930The argument must be 944The argument must be
931.Dq yes 945.Dq yes
932or 946or
933.Dq no . 947.Dq no .
948The default is
949.Dq yes .
934.It Cm RSAAuthentication 950.It Cm RSAAuthentication
935Specifies whether to try RSA authentication. 951Specifies whether to try RSA authentication.
936The argument to this keyword must be 952The argument to this keyword must be
@@ -940,6 +956,8 @@ or
940RSA authentication will only be 956RSA authentication will only be
941attempted if the identity file exists, or an authentication agent is 957attempted if the identity file exists, or an authentication agent is
942running. 958running.
959The default is
960.Dq yes .
943Note that this option applies to protocol version 1 only. 961Note that this option applies to protocol version 1 only.
944.It Cm ChallengeResponseAuthentication 962.It Cm ChallengeResponseAuthentication
945Specifies whether to use challenge response authentication. 963Specifies whether to use challenge response authentication.