[BACK]Return to scp.1 CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/scp.1 between version 1.100 and 1.101

version 1.100, 2021/08/11 14:07:54 version 1.101, 2021/09/08 23:31:39
Line 18 
Line 18 
 .Nd OpenSSH secure file copy  .Nd OpenSSH secure file copy
 .Sh SYNOPSIS  .Sh SYNOPSIS
 .Nm scp  .Nm scp
 .Op Fl 346ABCOpqRrsTv  .Op Fl 346ABCOpqRrTv
 .Op Fl c Ar cipher  .Op Fl c Ar cipher
 .Op Fl D Ar sftp_server_path  .Op Fl D Ar sftp_server_path
 .Op Fl F Ar ssh_config  .Op Fl F Ar ssh_config
Line 37 
Line 37 
 .Xr ssh 1  .Xr ssh 1
 for data transfer, and uses the same authentication and provides the  for data transfer, and uses the same authentication and provides the
 same security as a login session.  same security as a login session.
 The scp protocol requires execution of the remote user's shell to perform  
 .Xr glob 3  
 pattern matching.  
 .Pp  .Pp
 .Nm  .Nm
 will ask for passwords or passphrases if they are needed for  will ask for passwords or passphrases if they are needed for
Line 79 
Line 76 
 Copies between two remote hosts are transferred through the local host.  Copies between two remote hosts are transferred through the local host.
 Without this option the data is copied directly between the two remote  Without this option the data is copied directly between the two remote
 hosts.  hosts.
 Note that, when using the legacy SCP protocol (the default), this option  Note that, when using the legacy SCP protocol (via the
   .Fl O
   flag), this option
 selects batch mode for the second host as  selects batch mode for the second host as
 .Nm  .Nm
 cannot ask for passwords or passphrases for both hosts.  cannot ask for passwords or passphrases for both hosts.
Line 146 
Line 145 
 .It Fl O  .It Fl O
 Use the legacy SCP protocol for file transfers instead of the SFTP protocol.  Use the legacy SCP protocol for file transfers instead of the SFTP protocol.
 Forcing the use of the SCP protocol may be necessary for servers that do  Forcing the use of the SCP protocol may be necessary for servers that do
 not implement SFTP or for backwards-compatibility for particular filename  not implement SFTP, for backwards-compatibility for particular filename
 wildcard patterns.  wildcard patterns and for expanding paths with a
 This mode is the default.  .Sq ~
   prefix for older SFTP servers.
 .It Fl o Ar ssh_option  .It Fl o Ar ssh_option
 Can be used to pass options to  Can be used to pass options to
 .Nm ssh  .Nm ssh
Line 258 
Line 258 
 The program must understand  The program must understand
 .Xr ssh 1  .Xr ssh 1
 options.  options.
 .It Fl s  
 Use the SFTP protocol for file transfers instead of the legacy SCP protocol.  
 Using SFTP avoids invoking a shell on the remote side and provides  
 more predictable filename handling, as the SCP protocol  
 relied on the remote shell for expanding  
 .Xr glob 3  
 wildcards.  
 .Pp  
 A near-future release of OpenSSH will make the SFTP protocol the default.  
 This option will be deleted before the end of 2022.  
 .It Fl T  .It Fl T
 Disable strict filename checking.  Disable strict filename checking.
 By default when copying files from a remote host to a local directory  By default when copying files from a remote host to a local directory
Line 299 
Line 289 
 .Xr ssh_config 5 ,  .Xr ssh_config 5 ,
 .Xr sftp-server 8 ,  .Xr sftp-server 8 ,
 .Xr sshd 8  .Xr sshd 8
   .Sh CAVEATS
   The original scp protocol (selected by the
   .Fl O
   flag) requires execution of the remote user's shell to perform
   .Xr glob 3
   pattern matching.
   This requires careful quoting of any characters that have special meaning to
   the remote shell, such as quote characters.
 .Sh HISTORY  .Sh HISTORY
 .Nm  .Nm
 is based on the rcp program in  is based on the rcp program in
 .Bx  .Bx
 source code from the Regents of the University of California.  source code from the Regents of the University of California.
   .Pp
   Since OpenSSH 8.8,
   .Nm
   has use the SFTP protocol for transfers by default.
 .Sh AUTHORS  .Sh AUTHORS
 .An Timo Rinne Aq Mt tri@iki.fi  .An Timo Rinne Aq Mt tri@iki.fi
 .An Tatu Ylonen Aq Mt ylo@cs.hut.fi  .An Tatu Ylonen Aq Mt ylo@cs.hut.fi

Legend:
Removed from v.1.100  
changed lines
  Added in v.1.101