summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--scp.122
-rw-r--r--sftp.114
-rw-r--r--ssh.120
4 files changed, 45 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index d2e59410f..110cbe3b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,10 @@
26 - markus@cvs.openbsd.org 2001/08/14 09:23:02 26 - markus@cvs.openbsd.org 2001/08/14 09:23:02
27 [sftp.1 sftp-int.c] 27 [sftp.1 sftp-int.c]
28 "bye"; hk63a@netscape.net 28 "bye"; hk63a@netscape.net
29 - stevesk@cvs.openbsd.org 2001/08/14 17:54:29
30 [scp.1 sftp.1 ssh.1]
31 consistent documentation and example of ``-o ssh_option'' for sftp and
32 scp; document keyword=argument for ssh.
29 33
3020010814 3420010814
31 - (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup 35 - (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup
@@ -6315,4 +6319,4 @@
6315 - Wrote replacements for strlcpy and mkdtemp 6319 - Wrote replacements for strlcpy and mkdtemp
6316 - Released 1.0pre1 6320 - Released 1.0pre1
6317 6321
6318$Id: ChangeLog,v 1.1482 2001/08/15 23:22:56 mouring Exp $ 6322$Id: ChangeLog,v 1.1483 2001/08/15 23:25:46 mouring Exp $
diff --git a/scp.1 b/scp.1
index 395ffdf88..10bd85cad 100644
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
9.\" 9.\"
10.\" Created: Sun May 7 00:14:37 1995 ylo 10.\" Created: Sun May 7 00:14:37 1995 ylo
11.\" 11.\"
12.\" $OpenBSD: scp.1,v 1.16 2001/08/08 07:16:58 deraadt Exp $ 12.\" $OpenBSD: scp.1,v 1.17 2001/08/14 17:54:29 stevesk Exp $
13.\" 13.\"
14.Dd September 25, 1999 14.Dd September 25, 1999
15.Dt SCP 1 15.Dt SCP 1
@@ -24,7 +24,7 @@
24.Op Fl P Ar port 24.Op Fl P Ar port
25.Op Fl c Ar cipher 25.Op Fl c Ar cipher
26.Op Fl i Ar identity_file 26.Op Fl i Ar identity_file
27.Op Fl o Ar option 27.Op Fl o Ar ssh_option
28.Sm off 28.Sm off
29.Oo 29.Oo
30.Op Ar user@ 30.Op Ar user@
@@ -107,13 +107,17 @@ to use for the encrypted connection.
107The program must understand 107The program must understand
108.Xr ssh 1 108.Xr ssh 1
109options. 109options.
110.It Fl o Ar option 110.It Fl o Ar ssh_option
111Can be used to give options in the format used in the config file. 111Can be used to pass options to
112These options are passed directly to 112.Nm ssh
113.Xr ssh 1 , 113in the format used in the
114for instance 114.Xr ssh 1
115.Fl o "Protocol=1" 115configuration file. This is useful for specifying options
116would force protocol 1. 116for which there is no separate
117.Nm scp
118command-line flag. For example, to force the use of protocol
119version 1 you may specify
120.Ic scp -oProtocol=1 .
117.It Fl 4 121.It Fl 4
118Forces 122Forces
119.Nm 123.Nm
diff --git a/sftp.1 b/sftp.1
index 6a365a41d..25a9b8a48 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.22 2001/08/14 09:23:02 markus Exp $ 1.\" $OpenBSD: sftp.1,v 1.23 2001/08/14 17:54:29 stevesk Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -78,8 +78,16 @@ Enables compression (via ssh's
78.Fl C 78.Fl C
79flag) 79flag)
80.It Fl o Ar ssh_option 80.It Fl o Ar ssh_option
81Specify an option to be directly passed to 81Can be used to pass options to
82.Xr ssh 1 . 82.Nm ssh
83in the format used in the
84.Xr ssh 1
85configuration file. This is useful for specifying options
86for which there is no separate
87.Nm sftp
88command-line flag. For example, to force the use of protocol
89version 1 you may specify
90.Ic sftp -oProtocol=1 .
83.It Fl v 91.It Fl v
84Raise logging level. This option is also passed to ssh. 92Raise logging level. This option is also passed to ssh.
85.El 93.El
diff --git a/ssh.1 b/ssh.1
index b6fe0550f..8166bddda 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.126 2001/08/01 22:16:45 markus Exp $ 37.\" $OpenBSD: ssh.1,v 1.127 2001/08/14 17:54:29 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -492,10 +492,9 @@ Do not execute a remote command.
492This is useful if you just want to forward ports 492This is useful if you just want to forward ports
493(protocol version 2 only). 493(protocol version 2 only).
494.It Fl o Ar option 494.It Fl o Ar option
495Can be used to give options in the format used in the config file. 495Can be used to give options in the format used in the configuration file.
496This is useful for specifying options for which there is no separate 496This is useful for specifying options for which there is no separate
497command-line flag. 497command-line flag.
498The option has the same format as a line in the configuration file.
499.It Fl p Ar port 498.It Fl p Ar port
500Port to connect to on the remote host. 499Port to connect to on the remote host.
501This can be specified on a 500This can be specified on a
@@ -613,7 +612,8 @@ to use IPv6 addresses only.
613.El 612.El
614.Sh CONFIGURATION FILES 613.Sh CONFIGURATION FILES
615.Nm 614.Nm
616obtains configuration data from the following sources (in this order): 615obtains configuration data from the following sources in
616the following order:
617command line options, user's configuration file 617command line options, user's configuration file
618.Pq Pa $HOME/.ssh/config , 618.Pq Pa $HOME/.ssh/config ,
619and system-wide configuration file 619and system-wide configuration file
@@ -638,6 +638,18 @@ are comments.
638.Pp 638.Pp
639Otherwise a line is of the format 639Otherwise a line is of the format
640.Dq keyword arguments . 640.Dq keyword arguments .
641Configuration options may be separated by whitespace or
642optional whitespace and exactly one
643.Ql = ;
644the latter format is useful to avoid the need to quote whitespace
645when specifying configuration options using the
646.Nm ssh ,
647.Nm scp
648and
649.Nm sftp
650.Fl o
651option.
652.Pp
641The possible 653The possible
642keywords and their meanings are as follows (note that the 654keywords and their meanings are as follows (note that the
643configuration files are case-sensitive): 655configuration files are case-sensitive):