summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-06-25 05:08:11 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-06-25 05:08:11 +0000
commit2464322d7ee41dcd8beee12903775f7f2a80a164 (patch)
tree211b60ad7793b335208f5e53d9cf97c6725f558d
parente586c4ce3f4af32ef9eed72344f0fc7f43b9e58a (diff)
- itojun@cvs.openbsd.org 2001/06/23 17:48:18
[sftp.1 ssh.1 sshd.8 ssh-keyscan.1] kill whitespace at EOL.
-rw-r--r--ChangeLog5
-rw-r--r--sftp.142
-rw-r--r--ssh-keyscan.18
-rw-r--r--ssh.120
-rw-r--r--sshd.830
5 files changed, 54 insertions, 51 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a42d91b5..88b2fa08e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,9 @@
82 [ssh-keygen.c] 82 [ssh-keygen.c]
83 fix import for (broken?) ssh.com/f-secure private keys 83 fix import for (broken?) ssh.com/f-secure private keys
84 (i tested > 1000 RSA keys) 84 (i tested > 1000 RSA keys)
85 - itojun@cvs.openbsd.org 2001/06/23 17:48:18
86 [sftp.1 ssh.1 sshd.8 ssh-keyscan.1]
87 kill whitespace at EOL.
85 88
8620010622 8920010622
87 - (stevesk) handle systems without pw_expire and pw_change. 90 - (stevesk) handle systems without pw_expire and pw_change.
@@ -5766,4 +5769,4 @@
5766 - Wrote replacements for strlcpy and mkdtemp 5769 - Wrote replacements for strlcpy and mkdtemp
5767 - Released 1.0pre1 5770 - Released 1.0pre1
5768 5771
5769$Id: ChangeLog,v 1.1316 2001/06/25 05:04:58 mouring Exp $ 5772$Id: ChangeLog,v 1.1317 2001/06/25 05:08:11 mouring Exp $
diff --git a/sftp.1 b/sftp.1
index 6d8963087..dae551bdf 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.20 2001/06/23 05:57:08 deraadt Exp $ 1.\" $OpenBSD: sftp.1,v 1.21 2001/06/23 17:48:18 itojun Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -37,7 +37,7 @@
37.Nm sftp 37.Nm sftp
38.Op [\fIuser\fR@]\fIhost\fR[:\fIfile\fR [\fIfile\fR]] 38.Op [\fIuser\fR@]\fIhost\fR[:\fIfile\fR [\fIfile\fR]]
39.Nm sftp 39.Nm sftp
40.Op [\fIuser\fR@]\fIhost\fR[:\fIdir\fR[\fI/\fR]] 40.Op [\fIuser\fR@]\fIhost\fR[:\fIdir\fR[\fI/\fR]]
41.Sh DESCRIPTION 41.Sh DESCRIPTION
42.Nm 42.Nm
43is an interactive file transfer program, similar to 43is an interactive file transfer program, similar to
@@ -52,7 +52,7 @@ connects and logs into the specified
52.Ar host , 52.Ar host ,
53then enters an interactive command mode. 53then enters an interactive command mode.
54.Pp 54.Pp
55The second usage format will retrieve files automatically if a non-interactive 55The second usage format will retrieve files automatically if a non-interactive
56authentication method is used; otherwise it will do so after 56authentication method is used; otherwise it will do so after
57successful interactive authentication. 57successful interactive authentication.
58.Pp 58.Pp
@@ -68,13 +68,13 @@ instead of
68Since it lacks user interaction it should be used in conjunction with 68Since it lacks user interaction it should be used in conjunction with
69non-interactive authentication. 69non-interactive authentication.
70.Nm 70.Nm
71will abort if any of the following 71will abort if any of the following
72commands fail: 72commands fail:
73.Ic get , put , rename , ln , rm , mkdir , chdir , lchdir 73.Ic get , put , rename , ln , rm , mkdir , chdir , lchdir
74and 74and
75.Ic lmkdir . 75.Ic lmkdir .
76.It Fl C 76.It Fl C
77Enables compression (via ssh's 77Enables 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
@@ -86,31 +86,31 @@ Raise logging level. This option is also passed to ssh.
86.Sh INTERACTIVE COMMANDS 86.Sh INTERACTIVE COMMANDS
87Once in interactive mode, 87Once in interactive mode,
88.Nm 88.Nm
89understands a set of commands similar to those of 89understands a set of commands similar to those of
90.Xr ftp 1 . 90.Xr ftp 1 .
91Commands are case insensitive and pathnames may be enclosed in quotes if they 91Commands are case insensitive and pathnames may be enclosed in quotes if they
92contain spaces. 92contain spaces.
93.Bl -tag -width Ds 93.Bl -tag -width Ds
94.It Ic cd Ar path 94.It Ic cd Ar path
95Change remote directory to 95Change remote directory to
96.Ar path . 96.Ar path .
97.It Ic lcd Ar path 97.It Ic lcd Ar path
98Change local directory to 98Change local directory to
99.Ar path . 99.Ar path .
100.It Ic chgrp Ar grp Ar path 100.It Ic chgrp Ar grp Ar path
101Change group of file 101Change group of file
102.Ar path 102.Ar path
103to 103to
104.Ar grp . 104.Ar grp .
105.Ar grp 105.Ar grp
106must be a numeric GID. 106must be a numeric GID.
107.It Ic chmod Ar mode Ar path 107.It Ic chmod Ar mode Ar path
108Change permissions of file 108Change permissions of file
109.Ar path 109.Ar path
110to 110to
111.Ar mode . 111.Ar mode .
112.It Ic chown Ar own Ar path 112.It Ic chown Ar own Ar path
113Change owner of file 113Change owner of file
114.Ar path 114.Ar path
115to 115to
116.Ar own . 116.Ar own .
@@ -127,15 +127,15 @@ Retrieve the
127.Ar remote-path 127.Ar remote-path
128and store it on the local machine. 128and store it on the local machine.
129If the local 129If the local
130path name is not specified, it is given the same name it has on the 130path name is not specified, it is given the same name it has on the
131remote machine. If the 131remote machine. If the
132.Fl P 132.Fl P
133flag is specified, then the file's full permission and access time are 133flag is specified, then the file's full permission and access time are
134copied too. 134copied too.
135.It Ic help 135.It Ic help
136Display help text. 136Display help text.
137.It Ic lls Op Ar ls-options Op Ar path 137.It Ic lls Op Ar ls-options Op Ar path
138Display local directory listing of either 138Display local directory listing of either
139.Ar path 139.Ar path
140or current directory if 140or current directory if
141.Ar path 141.Ar path
@@ -144,7 +144,7 @@ is not specified.
144Create local directory specified by 144Create local directory specified by
145.Ar path . 145.Ar path .
146.It Ic ln Ar oldpath Ar newpath 146.It Ic ln Ar oldpath Ar newpath
147Create a symbolic link from 147Create a symbolic link from
148.Ar oldpath 148.Ar oldpath
149to 149to
150.Ar newpath . 150.Ar newpath .
@@ -157,7 +157,7 @@ or current directory if
157.Ar path 157.Ar path
158is not specified. 158is not specified.
159.It Ic lumask Ar umask 159.It Ic lumask Ar umask
160Set local umask to 160Set local umask to
161.Ar umask . 161.Ar umask .
162.It Ic mkdir Ar path 162.It Ic mkdir Ar path
163Create remote directory specified by 163Create remote directory specified by
@@ -169,8 +169,8 @@ Create remote directory specified by
169.Xc 169.Xc
170Upload 170Upload
171.Ar local-path 171.Ar local-path
172and store it on the remote machine. If the remote path name is not 172and store it on the remote machine. If the remote path name is not
173specified, it is given the same name it has on the local machine. If the 173specified, it is given the same name it has on the local machine. If the
174.Fl P 174.Fl P
175flag is specified, then the file's full permission and access time are 175flag is specified, then the file's full permission and access time are
176copied too. 176copied too.
@@ -190,12 +190,12 @@ Remove remote directory specified by
190Delete remote file specified by 190Delete remote file specified by
191.Ar path . 191.Ar path .
192.It Ic symlink Ar oldpath Ar newpath 192.It Ic symlink Ar oldpath Ar newpath
193Create a symbolic link from 193Create a symbolic link from
194.Ar oldpath 194.Ar oldpath
195to 195to
196.Ar newpath . 196.Ar newpath .
197.It Ic ! Ar command 197.It Ic ! Ar command
198Execute 198Execute
199.Ar command 199.Ar command
200in local shell. 200in local shell.
201.It Ic ! 201.It Ic !
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 5f86f2755..328d95ab1 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keyscan.1,v 1.7 2001/06/22 10:17:51 mpech Exp $ 1.\" $OpenBSD: ssh-keyscan.1,v 1.8 2001/06/23 17:48:18 itojun Exp $
2.\" 2.\"
3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4.\" 4.\"
@@ -47,21 +47,21 @@ have begun after you created your ssh_known_hosts file.
47.Sh OPTIONS 47.Sh OPTIONS
48.Bl -tag -width Ds 48.Bl -tag -width Ds
49.It Fl t 49.It Fl t
50Set the timeout for connection attempts. If 50Set the timeout for connection attempts. If
51.Pa timeout 51.Pa timeout
52seconds have elapsed since a connection was initiated to a host or since the 52seconds have elapsed since a connection was initiated to a host or since the
53last time anything was read from that host, then the connection is 53last time anything was read from that host, then the connection is
54closed and the host in question considered unavailable. Default is 5 54closed and the host in question considered unavailable. Default is 5
55seconds. 55seconds.
56.It Fl f 56.It Fl f
57Read hosts or 57Read hosts or
58.Pa addrlist namelist 58.Pa addrlist namelist
59pairs from this file, one per line. 59pairs from this file, one per line.
60If 60If
61.Pa - 61.Pa -
62is supplied instead of a filename, 62is supplied instead of a filename,
63.Nm 63.Nm
64will read hosts or 64will read hosts or
65.Pa addrlist namelist 65.Pa addrlist namelist
66pairs from the standard input. 66pairs from the standard input.
67.El 67.El
diff --git a/ssh.1 b/ssh.1
index 94a22f1e4..f56b330f1 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.116 2001/06/23 02:34:31 markus Exp $ 37.\" $OpenBSD: ssh.1,v 1.117 2001/06/23 17:48:19 itojun Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -269,7 +269,7 @@ of
269.Ss Escape Characters 269.Ss Escape Characters
270.Pp 270.Pp
271When a pseudo terminal has been requested, ssh supports a number of functions 271When a pseudo terminal has been requested, ssh supports a number of functions
272through the use of an escape character. 272through the use of an escape character.
273.Pp 273.Pp
274A single tilde character can be sent as 274A single tilde character can be sent as
275.Ic ~~ 275.Ic ~~
@@ -278,7 +278,7 @@ The escape character must always follow a newline to be interpreted as
278special. 278special.
279The escape character can be changed in configuration files using the 279The escape character can be changed in configuration files using the
280.Cm EscapeChar 280.Cm EscapeChar
281configuration directive or on the command line by the 281configuration directive or on the command line by the
282.Fl e 282.Fl e
283option. 283option.
284.Pp 284.Pp
@@ -510,8 +510,8 @@ Quiet mode.
510Causes all warning and diagnostic messages to be suppressed. 510Causes all warning and diagnostic messages to be suppressed.
511Only fatal errors are displayed. 511Only fatal errors are displayed.
512.It Fl s 512.It Fl s
513May be used to request invocation of a subsystem on the remote system. Subsystems are a feature of the SSH2 protocol which facilitate the use 513May be used to request invocation of a subsystem on the remote system. Subsystems are a feature of the SSH2 protocol which facilitate the use
514of SSH as a secure transport for other applications (eg. sftp). The 514of SSH as a secure transport for other applications (eg. sftp). The
515subsystem is specified as the remote command. 515subsystem is specified as the remote command.
516.It Fl t 516.It Fl t
517Force pseudo-tty allocation. 517Force pseudo-tty allocation.
@@ -698,7 +698,7 @@ The default is
698Specifies the cipher to use for encrypting the session 698Specifies the cipher to use for encrypting the session
699in protocol version 1. 699in protocol version 1.
700Currently, 700Currently,
701.Dq blowfish 701.Dq blowfish
702and 702and
703.Dq 3des 703.Dq 3des
704are supported. 704are supported.
@@ -883,7 +883,7 @@ The possible values are:
883QUIET, FATAL, ERROR, INFO, VERBOSE and DEBUG. 883QUIET, FATAL, ERROR, INFO, VERBOSE and DEBUG.
884The default is INFO. 884The default is INFO.
885.It Cm MACs 885.It Cm MACs
886Specifies the MAC (message authentication code) algorithms 886Specifies the MAC (message authentication code) algorithms
887in order of preference. 887in order of preference.
888The MAC algorithm is used in protocol version 2 888The MAC algorithm is used in protocol version 2
889for data integrity protection. 889for data integrity protection.
@@ -906,8 +906,8 @@ The default is
906Specifies the port number to connect on the remote host. 906Specifies the port number to connect on the remote host.
907Default is 22. 907Default is 22.
908.It Cm PreferredAuthentications 908.It Cm PreferredAuthentications
909Specifies the order in which the client should try protocol 2 909Specifies the order in which the client should try protocol 2
910authentication methods. This allows a client to prefer one method (e.g. 910authentication methods. This allows a client to prefer one method (e.g.
911.Cm keyboard-interactive ) 911.Cm keyboard-interactive )
912over another method (e.g. 912over another method (e.g.
913.Cm password ) 913.Cm password )
@@ -979,7 +979,7 @@ Disabling rhosts authentication may reduce
979authentication time on slow connections when rhosts authentication is 979authentication time on slow connections when rhosts authentication is
980not used. 980not used.
981Most servers do not permit RhostsAuthentication because it 981Most servers do not permit RhostsAuthentication because it
982is not secure (see 982is not secure (see
983.Cm RhostsRSAAuthentication ) . 983.Cm RhostsRSAAuthentication ) .
984The argument to this keyword must be 984The argument to this keyword must be
985.Dq yes 985.Dq yes
diff --git a/sshd.8 b/sshd.8
index d049fceaa..e143e84d4 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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.132 2001/06/23 03:03:59 markus Exp $ 37.\" $OpenBSD: sshd.8,v 1.133 2001/06/23 17:48:19 itojun Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -374,7 +374,7 @@ The default is
374.Dq aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour. 374.Dq aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour.
375.It Cm ClientAliveInterval 375.It Cm ClientAliveInterval
376Sets a timeout interval in seconds after which if no data has been received 376Sets a timeout interval in seconds after which if no data has been received
377from the client, 377from the client,
378.Nm 378.Nm
379will send a message through the encrypted 379will send a message through the encrypted
380channel to request a response from the client. 380channel to request a response from the client.
@@ -386,10 +386,10 @@ Sets the number of client alive messages (see above) which may be
386sent without 386sent without
387.Nm 387.Nm
388receiving any messages back from the client. If this threshold is 388receiving any messages back from the client. If this threshold is
389reached while client alive messages are being sent, 389reached while client alive messages are being sent,
390.Nm 390.Nm
391will disconnect the client, terminating the session. It is important 391will disconnect the client, terminating the session. It is important
392to note that the use of client alive messages is very different from 392to note that the use of client alive messages is very different from
393.Cm Keepalive 393.Cm Keepalive
394(below). The client alive messages are sent through the 394(below). The client alive messages are sent through the
395encrypted channel and therefore will not be spoofable. The TCP keepalive 395encrypted channel and therefore will not be spoofable. The TCP keepalive
@@ -402,7 +402,7 @@ clients having an active connection to the server.
402The default value is 3. If you set 402The default value is 3. If you set
403.Cm ClientAliveInterval 403.Cm ClientAliveInterval
404(above) to 15, and leave this value at the default, unresponsive ssh clients 404(above) to 15, and leave this value at the default, unresponsive ssh clients
405will be disconnected after approximately 45 seconds. 405will be disconnected after approximately 45 seconds.
406.It Cm DenyGroups 406.It Cm DenyGroups
407This keyword can be followed by a number of group names, separated 407This keyword can be followed by a number of group names, separated
408by spaces. 408by spaces.
@@ -787,12 +787,12 @@ The default is
787Note that 787Note that
788.Xr login 1 788.Xr login 1
789is never used for remote command execution. 789is never used for remote command execution.
790Note also, that if this is enabled, 790Note also, that if this is enabled,
791.Cm X11Forwarding 791.Cm X11Forwarding
792will be disabled because 792will be disabled because
793.Xr login 1 793.Xr login 1
794does not know how to handle 794does not know how to handle
795.Xr xauth 1 795.Xr xauth 1
796cookies. 796cookies.
797.It Cm X11DisplayOffset 797.It Cm X11DisplayOffset
798Specifies the first display number available for 798Specifies the first display number available for
@@ -808,9 +808,9 @@ The default is
808.Dq no . 808.Dq no .
809Note that disabling X11 forwarding does not improve security in any 809Note that disabling X11 forwarding does not improve security in any
810way, as users can always install their own forwarders. 810way, as users can always install their own forwarders.
811X11 forwarding is automatically disabled if 811X11 forwarding is automatically disabled if
812.Cm UseLogin 812.Cm UseLogin
813is enabled. 813is enabled.
814.It Cm XAuthLocation 814.It Cm XAuthLocation
815Specifies the location of the 815Specifies the location of the
816.Xr xauth 1 816.Xr xauth 1
@@ -1005,13 +1005,13 @@ authentication.
1005.It Cm no-pty 1005.It Cm no-pty
1006Prevents tty allocation (a request to allocate a pty will fail). 1006Prevents tty allocation (a request to allocate a pty will fail).
1007.It Cm permitopen="host:port" 1007.It Cm permitopen="host:port"
1008Limit local 1008Limit local
1009.Li ``ssh -L'' 1009.Li ``ssh -L''
1010port forwarding such that it may only connect to the specified host and 1010port forwarding such that it may only connect to the specified host and
1011port. Multiple 1011port. Multiple
1012.Cm permitopen 1012.Cm permitopen
1013options may be applied separated by commas. No pattern matching is 1013options may be applied separated by commas. No pattern matching is
1014performed on the specified hostnames, they must be literal domains or 1014performed on the specified hostnames, they must be literal domains or
1015addresses. 1015addresses.
1016.El 1016.El
1017.Ss Examples 1017.Ss Examples