mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-31 01:35:11 +02:00
- itojun@cvs.openbsd.org 2001/06/23 17:48:18
[sftp.1 ssh.1 sshd.8 ssh-keyscan.1] kill whitespace at EOL.
This commit is contained in:
parent
e586c4ce3f
commit
2464322d7e
@ -82,6 +82,9 @@
|
|||||||
[ssh-keygen.c]
|
[ssh-keygen.c]
|
||||||
fix import for (broken?) ssh.com/f-secure private keys
|
fix import for (broken?) ssh.com/f-secure private keys
|
||||||
(i tested > 1000 RSA keys)
|
(i tested > 1000 RSA keys)
|
||||||
|
- itojun@cvs.openbsd.org 2001/06/23 17:48:18
|
||||||
|
[sftp.1 ssh.1 sshd.8 ssh-keyscan.1]
|
||||||
|
kill whitespace at EOL.
|
||||||
|
|
||||||
20010622
|
20010622
|
||||||
- (stevesk) handle systems without pw_expire and pw_change.
|
- (stevesk) handle systems without pw_expire and pw_change.
|
||||||
@ -5766,4 +5769,4 @@
|
|||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.1316 2001/06/25 05:04:58 mouring Exp $
|
$Id: ChangeLog,v 1.1317 2001/06/25 05:08:11 mouring Exp $
|
||||||
|
42
sftp.1
42
sftp.1
@ -1,4 +1,4 @@
|
|||||||
.\" $OpenBSD: sftp.1,v 1.20 2001/06/23 05:57:08 deraadt Exp $
|
.\" $OpenBSD: sftp.1,v 1.21 2001/06/23 17:48:18 itojun Exp $
|
||||||
.\"
|
.\"
|
||||||
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
|
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
|
||||||
.\"
|
.\"
|
||||||
@ -37,7 +37,7 @@
|
|||||||
.Nm sftp
|
.Nm sftp
|
||||||
.Op [\fIuser\fR@]\fIhost\fR[:\fIfile\fR [\fIfile\fR]]
|
.Op [\fIuser\fR@]\fIhost\fR[:\fIfile\fR [\fIfile\fR]]
|
||||||
.Nm sftp
|
.Nm sftp
|
||||||
.Op [\fIuser\fR@]\fIhost\fR[:\fIdir\fR[\fI/\fR]]
|
.Op [\fIuser\fR@]\fIhost\fR[:\fIdir\fR[\fI/\fR]]
|
||||||
.Sh DESCRIPTION
|
.Sh DESCRIPTION
|
||||||
.Nm
|
.Nm
|
||||||
is an interactive file transfer program, similar to
|
is an interactive file transfer program, similar to
|
||||||
@ -52,7 +52,7 @@ connects and logs into the specified
|
|||||||
.Ar host ,
|
.Ar host ,
|
||||||
then enters an interactive command mode.
|
then enters an interactive command mode.
|
||||||
.Pp
|
.Pp
|
||||||
The second usage format will retrieve files automatically if a non-interactive
|
The second usage format will retrieve files automatically if a non-interactive
|
||||||
authentication method is used; otherwise it will do so after
|
authentication method is used; otherwise it will do so after
|
||||||
successful interactive authentication.
|
successful interactive authentication.
|
||||||
.Pp
|
.Pp
|
||||||
@ -68,13 +68,13 @@ instead of
|
|||||||
Since it lacks user interaction it should be used in conjunction with
|
Since it lacks user interaction it should be used in conjunction with
|
||||||
non-interactive authentication.
|
non-interactive authentication.
|
||||||
.Nm
|
.Nm
|
||||||
will abort if any of the following
|
will abort if any of the following
|
||||||
commands fail:
|
commands fail:
|
||||||
.Ic get , put , rename , ln , rm , mkdir , chdir , lchdir
|
.Ic get , put , rename , ln , rm , mkdir , chdir , lchdir
|
||||||
and
|
and
|
||||||
.Ic lmkdir .
|
.Ic lmkdir .
|
||||||
.It Fl C
|
.It Fl C
|
||||||
Enables compression (via ssh's
|
Enables compression (via ssh's
|
||||||
.Fl C
|
.Fl C
|
||||||
flag)
|
flag)
|
||||||
.It Fl o Ar ssh_option
|
.It Fl o Ar ssh_option
|
||||||
@ -86,31 +86,31 @@ Raise logging level. This option is also passed to ssh.
|
|||||||
.Sh INTERACTIVE COMMANDS
|
.Sh INTERACTIVE COMMANDS
|
||||||
Once in interactive mode,
|
Once in interactive mode,
|
||||||
.Nm
|
.Nm
|
||||||
understands a set of commands similar to those of
|
understands a set of commands similar to those of
|
||||||
.Xr ftp 1 .
|
.Xr ftp 1 .
|
||||||
Commands are case insensitive and pathnames may be enclosed in quotes if they
|
Commands are case insensitive and pathnames may be enclosed in quotes if they
|
||||||
contain spaces.
|
contain spaces.
|
||||||
.Bl -tag -width Ds
|
.Bl -tag -width Ds
|
||||||
.It Ic cd Ar path
|
.It Ic cd Ar path
|
||||||
Change remote directory to
|
Change remote directory to
|
||||||
.Ar path .
|
.Ar path .
|
||||||
.It Ic lcd Ar path
|
.It Ic lcd Ar path
|
||||||
Change local directory to
|
Change local directory to
|
||||||
.Ar path .
|
.Ar path .
|
||||||
.It Ic chgrp Ar grp Ar path
|
.It Ic chgrp Ar grp Ar path
|
||||||
Change group of file
|
Change group of file
|
||||||
.Ar path
|
.Ar path
|
||||||
to
|
to
|
||||||
.Ar grp .
|
.Ar grp .
|
||||||
.Ar grp
|
.Ar grp
|
||||||
must be a numeric GID.
|
must be a numeric GID.
|
||||||
.It Ic chmod Ar mode Ar path
|
.It Ic chmod Ar mode Ar path
|
||||||
Change permissions of file
|
Change permissions of file
|
||||||
.Ar path
|
.Ar path
|
||||||
to
|
to
|
||||||
.Ar mode .
|
.Ar mode .
|
||||||
.It Ic chown Ar own Ar path
|
.It Ic chown Ar own Ar path
|
||||||
Change owner of file
|
Change owner of file
|
||||||
.Ar path
|
.Ar path
|
||||||
to
|
to
|
||||||
.Ar own .
|
.Ar own .
|
||||||
@ -127,15 +127,15 @@ Retrieve the
|
|||||||
.Ar remote-path
|
.Ar remote-path
|
||||||
and store it on the local machine.
|
and store it on the local machine.
|
||||||
If the local
|
If the local
|
||||||
path name is not specified, it is given the same name it has on the
|
path name is not specified, it is given the same name it has on the
|
||||||
remote machine. If the
|
remote machine. If the
|
||||||
.Fl P
|
.Fl P
|
||||||
flag is specified, then the file's full permission and access time are
|
flag is specified, then the file's full permission and access time are
|
||||||
copied too.
|
copied too.
|
||||||
.It Ic help
|
.It Ic help
|
||||||
Display help text.
|
Display help text.
|
||||||
.It Ic lls Op Ar ls-options Op Ar path
|
.It Ic lls Op Ar ls-options Op Ar path
|
||||||
Display local directory listing of either
|
Display local directory listing of either
|
||||||
.Ar path
|
.Ar path
|
||||||
or current directory if
|
or current directory if
|
||||||
.Ar path
|
.Ar path
|
||||||
@ -144,7 +144,7 @@ is not specified.
|
|||||||
Create local directory specified by
|
Create local directory specified by
|
||||||
.Ar path .
|
.Ar path .
|
||||||
.It Ic ln Ar oldpath Ar newpath
|
.It Ic ln Ar oldpath Ar newpath
|
||||||
Create a symbolic link from
|
Create a symbolic link from
|
||||||
.Ar oldpath
|
.Ar oldpath
|
||||||
to
|
to
|
||||||
.Ar newpath .
|
.Ar newpath .
|
||||||
@ -157,7 +157,7 @@ or current directory if
|
|||||||
.Ar path
|
.Ar path
|
||||||
is not specified.
|
is not specified.
|
||||||
.It Ic lumask Ar umask
|
.It Ic lumask Ar umask
|
||||||
Set local umask to
|
Set local umask to
|
||||||
.Ar umask .
|
.Ar umask .
|
||||||
.It Ic mkdir Ar path
|
.It Ic mkdir Ar path
|
||||||
Create remote directory specified by
|
Create remote directory specified by
|
||||||
@ -169,8 +169,8 @@ Create remote directory specified by
|
|||||||
.Xc
|
.Xc
|
||||||
Upload
|
Upload
|
||||||
.Ar local-path
|
.Ar local-path
|
||||||
and store it on the remote machine. If the remote path name is not
|
and store it on the remote machine. If the remote path name is not
|
||||||
specified, it is given the same name it has on the local machine. If the
|
specified, it is given the same name it has on the local machine. If the
|
||||||
.Fl P
|
.Fl P
|
||||||
flag is specified, then the file's full permission and access time are
|
flag is specified, then the file's full permission and access time are
|
||||||
copied too.
|
copied too.
|
||||||
@ -190,12 +190,12 @@ Remove remote directory specified by
|
|||||||
Delete remote file specified by
|
Delete remote file specified by
|
||||||
.Ar path .
|
.Ar path .
|
||||||
.It Ic symlink Ar oldpath Ar newpath
|
.It Ic symlink Ar oldpath Ar newpath
|
||||||
Create a symbolic link from
|
Create a symbolic link from
|
||||||
.Ar oldpath
|
.Ar oldpath
|
||||||
to
|
to
|
||||||
.Ar newpath .
|
.Ar newpath .
|
||||||
.It Ic ! Ar command
|
.It Ic ! Ar command
|
||||||
Execute
|
Execute
|
||||||
.Ar command
|
.Ar command
|
||||||
in local shell.
|
in local shell.
|
||||||
.It Ic !
|
.It Ic !
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
.\" $OpenBSD: ssh-keyscan.1,v 1.7 2001/06/22 10:17:51 mpech Exp $
|
.\" $OpenBSD: ssh-keyscan.1,v 1.8 2001/06/23 17:48:18 itojun Exp $
|
||||||
.\"
|
.\"
|
||||||
.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
|
.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
|
||||||
.\"
|
.\"
|
||||||
@ -47,21 +47,21 @@ have begun after you created your ssh_known_hosts file.
|
|||||||
.Sh OPTIONS
|
.Sh OPTIONS
|
||||||
.Bl -tag -width Ds
|
.Bl -tag -width Ds
|
||||||
.It Fl t
|
.It Fl t
|
||||||
Set the timeout for connection attempts. If
|
Set the timeout for connection attempts. If
|
||||||
.Pa timeout
|
.Pa timeout
|
||||||
seconds have elapsed since a connection was initiated to a host or since the
|
seconds have elapsed since a connection was initiated to a host or since the
|
||||||
last time anything was read from that host, then the connection is
|
last time anything was read from that host, then the connection is
|
||||||
closed and the host in question considered unavailable. Default is 5
|
closed and the host in question considered unavailable. Default is 5
|
||||||
seconds.
|
seconds.
|
||||||
.It Fl f
|
.It Fl f
|
||||||
Read hosts or
|
Read hosts or
|
||||||
.Pa addrlist namelist
|
.Pa addrlist namelist
|
||||||
pairs from this file, one per line.
|
pairs from this file, one per line.
|
||||||
If
|
If
|
||||||
.Pa -
|
.Pa -
|
||||||
is supplied instead of a filename,
|
is supplied instead of a filename,
|
||||||
.Nm
|
.Nm
|
||||||
will read hosts or
|
will read hosts or
|
||||||
.Pa addrlist namelist
|
.Pa addrlist namelist
|
||||||
pairs from the standard input.
|
pairs from the standard input.
|
||||||
.El
|
.El
|
||||||
|
20
ssh.1
20
ssh.1
@ -34,7 +34,7 @@
|
|||||||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
.\"
|
.\"
|
||||||
.\" $OpenBSD: ssh.1,v 1.116 2001/06/23 02:34:31 markus Exp $
|
.\" $OpenBSD: ssh.1,v 1.117 2001/06/23 17:48:19 itojun Exp $
|
||||||
.Dd September 25, 1999
|
.Dd September 25, 1999
|
||||||
.Dt SSH 1
|
.Dt SSH 1
|
||||||
.Os
|
.Os
|
||||||
@ -269,7 +269,7 @@ of
|
|||||||
.Ss Escape Characters
|
.Ss Escape Characters
|
||||||
.Pp
|
.Pp
|
||||||
When a pseudo terminal has been requested, ssh supports a number of functions
|
When a pseudo terminal has been requested, ssh supports a number of functions
|
||||||
through the use of an escape character.
|
through the use of an escape character.
|
||||||
.Pp
|
.Pp
|
||||||
A single tilde character can be sent as
|
A single tilde character can be sent as
|
||||||
.Ic ~~
|
.Ic ~~
|
||||||
@ -278,7 +278,7 @@ The escape character must always follow a newline to be interpreted as
|
|||||||
special.
|
special.
|
||||||
The escape character can be changed in configuration files using the
|
The escape character can be changed in configuration files using the
|
||||||
.Cm EscapeChar
|
.Cm EscapeChar
|
||||||
configuration directive or on the command line by the
|
configuration directive or on the command line by the
|
||||||
.Fl e
|
.Fl e
|
||||||
option.
|
option.
|
||||||
.Pp
|
.Pp
|
||||||
@ -510,8 +510,8 @@ Quiet mode.
|
|||||||
Causes all warning and diagnostic messages to be suppressed.
|
Causes all warning and diagnostic messages to be suppressed.
|
||||||
Only fatal errors are displayed.
|
Only fatal errors are displayed.
|
||||||
.It Fl s
|
.It Fl s
|
||||||
May be used to request invocation of a subsystem on the remote system. Subsystems are a feature of the SSH2 protocol which facilitate the use
|
May be used to request invocation of a subsystem on the remote system. Subsystems are a feature of the SSH2 protocol which facilitate the use
|
||||||
of SSH as a secure transport for other applications (eg. sftp). The
|
of SSH as a secure transport for other applications (eg. sftp). The
|
||||||
subsystem is specified as the remote command.
|
subsystem is specified as the remote command.
|
||||||
.It Fl t
|
.It Fl t
|
||||||
Force pseudo-tty allocation.
|
Force pseudo-tty allocation.
|
||||||
@ -698,7 +698,7 @@ The default is
|
|||||||
Specifies the cipher to use for encrypting the session
|
Specifies the cipher to use for encrypting the session
|
||||||
in protocol version 1.
|
in protocol version 1.
|
||||||
Currently,
|
Currently,
|
||||||
.Dq blowfish
|
.Dq blowfish
|
||||||
and
|
and
|
||||||
.Dq 3des
|
.Dq 3des
|
||||||
are supported.
|
are supported.
|
||||||
@ -883,7 +883,7 @@ The possible values are:
|
|||||||
QUIET, FATAL, ERROR, INFO, VERBOSE and DEBUG.
|
QUIET, FATAL, ERROR, INFO, VERBOSE and DEBUG.
|
||||||
The default is INFO.
|
The default is INFO.
|
||||||
.It Cm MACs
|
.It Cm MACs
|
||||||
Specifies the MAC (message authentication code) algorithms
|
Specifies the MAC (message authentication code) algorithms
|
||||||
in order of preference.
|
in order of preference.
|
||||||
The MAC algorithm is used in protocol version 2
|
The MAC algorithm is used in protocol version 2
|
||||||
for data integrity protection.
|
for data integrity protection.
|
||||||
@ -906,8 +906,8 @@ The default is
|
|||||||
Specifies the port number to connect on the remote host.
|
Specifies the port number to connect on the remote host.
|
||||||
Default is 22.
|
Default is 22.
|
||||||
.It Cm PreferredAuthentications
|
.It Cm PreferredAuthentications
|
||||||
Specifies the order in which the client should try protocol 2
|
Specifies the order in which the client should try protocol 2
|
||||||
authentication methods. This allows a client to prefer one method (e.g.
|
authentication methods. This allows a client to prefer one method (e.g.
|
||||||
.Cm keyboard-interactive )
|
.Cm keyboard-interactive )
|
||||||
over another method (e.g.
|
over another method (e.g.
|
||||||
.Cm password )
|
.Cm password )
|
||||||
@ -979,7 +979,7 @@ Disabling rhosts authentication may reduce
|
|||||||
authentication time on slow connections when rhosts authentication is
|
authentication time on slow connections when rhosts authentication is
|
||||||
not used.
|
not used.
|
||||||
Most servers do not permit RhostsAuthentication because it
|
Most servers do not permit RhostsAuthentication because it
|
||||||
is not secure (see
|
is not secure (see
|
||||||
.Cm RhostsRSAAuthentication ) .
|
.Cm RhostsRSAAuthentication ) .
|
||||||
The argument to this keyword must be
|
The argument to this keyword must be
|
||||||
.Dq yes
|
.Dq yes
|
||||||
|
30
sshd.8
30
sshd.8
@ -34,7 +34,7 @@
|
|||||||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
.\"
|
.\"
|
||||||
.\" $OpenBSD: sshd.8,v 1.132 2001/06/23 03:03:59 markus Exp $
|
.\" $OpenBSD: sshd.8,v 1.133 2001/06/23 17:48:19 itojun Exp $
|
||||||
.Dd September 25, 1999
|
.Dd September 25, 1999
|
||||||
.Dt SSHD 8
|
.Dt SSHD 8
|
||||||
.Os
|
.Os
|
||||||
@ -374,7 +374,7 @@ The default is
|
|||||||
.Dq aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour.
|
.Dq aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour.
|
||||||
.It Cm ClientAliveInterval
|
.It Cm ClientAliveInterval
|
||||||
Sets a timeout interval in seconds after which if no data has been received
|
Sets a timeout interval in seconds after which if no data has been received
|
||||||
from the client,
|
from the client,
|
||||||
.Nm
|
.Nm
|
||||||
will send a message through the encrypted
|
will send a message through the encrypted
|
||||||
channel to request a response from the client.
|
channel to request a response from the client.
|
||||||
@ -386,10 +386,10 @@ Sets the number of client alive messages (see above) which may be
|
|||||||
sent without
|
sent without
|
||||||
.Nm
|
.Nm
|
||||||
receiving any messages back from the client. If this threshold is
|
receiving any messages back from the client. If this threshold is
|
||||||
reached while client alive messages are being sent,
|
reached while client alive messages are being sent,
|
||||||
.Nm
|
.Nm
|
||||||
will disconnect the client, terminating the session. It is important
|
will disconnect the client, terminating the session. It is important
|
||||||
to note that the use of client alive messages is very different from
|
to note that the use of client alive messages is very different from
|
||||||
.Cm Keepalive
|
.Cm Keepalive
|
||||||
(below). The client alive messages are sent through the
|
(below). The client alive messages are sent through the
|
||||||
encrypted channel and therefore will not be spoofable. The TCP keepalive
|
encrypted channel and therefore will not be spoofable. The TCP keepalive
|
||||||
@ -402,7 +402,7 @@ clients having an active connection to the server.
|
|||||||
The default value is 3. If you set
|
The default value is 3. If you set
|
||||||
.Cm ClientAliveInterval
|
.Cm ClientAliveInterval
|
||||||
(above) to 15, and leave this value at the default, unresponsive ssh clients
|
(above) to 15, and leave this value at the default, unresponsive ssh clients
|
||||||
will be disconnected after approximately 45 seconds.
|
will be disconnected after approximately 45 seconds.
|
||||||
.It Cm DenyGroups
|
.It Cm DenyGroups
|
||||||
This keyword can be followed by a number of group names, separated
|
This keyword can be followed by a number of group names, separated
|
||||||
by spaces.
|
by spaces.
|
||||||
@ -787,12 +787,12 @@ The default is
|
|||||||
Note that
|
Note that
|
||||||
.Xr login 1
|
.Xr login 1
|
||||||
is never used for remote command execution.
|
is never used for remote command execution.
|
||||||
Note also, that if this is enabled,
|
Note also, that if this is enabled,
|
||||||
.Cm X11Forwarding
|
.Cm X11Forwarding
|
||||||
will be disabled because
|
will be disabled because
|
||||||
.Xr login 1
|
.Xr login 1
|
||||||
does not know how to handle
|
does not know how to handle
|
||||||
.Xr xauth 1
|
.Xr xauth 1
|
||||||
cookies.
|
cookies.
|
||||||
.It Cm X11DisplayOffset
|
.It Cm X11DisplayOffset
|
||||||
Specifies the first display number available for
|
Specifies the first display number available for
|
||||||
@ -808,9 +808,9 @@ The default is
|
|||||||
.Dq no .
|
.Dq no .
|
||||||
Note that disabling X11 forwarding does not improve security in any
|
Note that disabling X11 forwarding does not improve security in any
|
||||||
way, as users can always install their own forwarders.
|
way, as users can always install their own forwarders.
|
||||||
X11 forwarding is automatically disabled if
|
X11 forwarding is automatically disabled if
|
||||||
.Cm UseLogin
|
.Cm UseLogin
|
||||||
is enabled.
|
is enabled.
|
||||||
.It Cm XAuthLocation
|
.It Cm XAuthLocation
|
||||||
Specifies the location of the
|
Specifies the location of the
|
||||||
.Xr xauth 1
|
.Xr xauth 1
|
||||||
@ -1005,13 +1005,13 @@ authentication.
|
|||||||
.It Cm no-pty
|
.It Cm no-pty
|
||||||
Prevents tty allocation (a request to allocate a pty will fail).
|
Prevents tty allocation (a request to allocate a pty will fail).
|
||||||
.It Cm permitopen="host:port"
|
.It Cm permitopen="host:port"
|
||||||
Limit local
|
Limit local
|
||||||
.Li ``ssh -L''
|
.Li ``ssh -L''
|
||||||
port forwarding such that it may only connect to the specified host and
|
port forwarding such that it may only connect to the specified host and
|
||||||
port. Multiple
|
port. Multiple
|
||||||
.Cm permitopen
|
.Cm permitopen
|
||||||
options may be applied separated by commas. No pattern matching is
|
options may be applied separated by commas. No pattern matching is
|
||||||
performed on the specified hostnames, they must be literal domains or
|
performed on the specified hostnames, they must be literal domains or
|
||||||
addresses.
|
addresses.
|
||||||
.El
|
.El
|
||||||
.Ss Examples
|
.Ss Examples
|
||||||
|
Loading…
x
Reference in New Issue
Block a user