Import openssh_8.0p1.orig.tar.gz

1 files changed, 34 insertions, 17 deletions

diff --git a/sftp.0 b/sftp.0
index ed98400d3..2342c2320 100644
--- a/sftp.0
+++ b/sftp.0
@@ -5,9 +5,10 @@ NAME
 
 SYNOPSIS
      sftp [-46aCfpqrv] [-B buffer_size] [-b batchfile] [-c cipher]
-          [-D sftp_server_path] [-F ssh_config] [-i identity_file] [-l limit]
-          [-o ssh_option] [-P port] [-R num_requests] [-S program]
-          [-s subsystem | sftp_server] destination
+          [-D sftp_server_path] [-F ssh_config] [-i identity_file]
+          [-J destination] [-l limit] [-o ssh_option] [-P port]
+          [-R num_requests] [-S program] [-s subsystem | sftp_server]
+          destination
 
 DESCRIPTION
      sftp is a file transfer program, similar to ftp(1), which performs all
@@ -52,13 +53,18 @@ DESCRIPTION
              instead of stdin.  Since it lacks user interaction it should be
              used in conjunction with non-interactive authentication to
              obviate the need to enter a password at connection time (see
-             sshd(8) and ssh-keygen(1) for details).  A batchfile of M-bM-^@M-^X-M-bM-^@M-^Y may
-             be used to indicate standard input.  sftp will abort if any of
-             the following commands fail: get, put, reget, reput, rename, ln,
-             rm, mkdir, chdir, ls, lchdir, chmod, chown, chgrp, lpwd, df,
-             symlink, and lmkdir.  Termination on error can be suppressed on a
-             command by command basis by prefixing the command with a M-bM-^@M-^X-M-bM-^@M-^Y
-             character (for example, -rm /tmp/blah*).
+             sshd(8) and ssh-keygen(1) for details).
+
+             A batchfile of M-bM-^@M-^X-M-bM-^@M-^Y may be used to indicate standard input.  sftp
+             will abort if any of the following commands fail: get, put,
+             reget, reput, rename, ln, rm, mkdir, chdir, ls, lchdir, chmod,
+             chown, chgrp, lpwd, df, symlink, and lmkdir.
+
+             Termination on error can be suppressed on a command by command
+             basis by prefixing the command with a M-bM-^@M-^X-M-bM-^@M-^Y character (for example,
+             -rm /tmp/blah*).  Echo of the command may be suppressed by
+             prefixing the command with a M-bM-^@M-^X@M-bM-^@M-^Y character.  These two prefixes
+             may be combined in any order, for example -@ls /bsd.
 
      -C      Enables compression (via ssh's -C flag).
 
@@ -83,6 +89,14 @@ DESCRIPTION
              key authentication is read.  This option is directly passed to
              ssh(1).
 
+     -J destination
+             Connect to the target host by first making an sftp connection to
+             the jump host described by destination and then establishing a
+             TCP forwarding to the ultimate destination from there.  Multiple
+             jump hops may be specified separated by comma characters.  This
+             is a shortcut to specify a ProxyJump configuration directive.
+             This option is directly passed to ssh(1).
+
      -l limit
              Limits the used bandwidth, specified in Kbit/s.
 
@@ -197,17 +211,20 @@ INTERACTIVE COMMANDS
              Change remote directory to path.  If path is not specified, then
              change directory to the one the session started in.
 
-     chgrp grp path
-             Change group of file path to grp.  path may contain glob(7)
+     chgrp [-h] grp path
+             Change group of file path to grp.  If the -h flag is specified,
+             then symlinks will not be followed.  path may contain glob(7)
              characters and may match multiple files.  grp must be a numeric
              GID.
 
-     chmod mode path
-             Change permissions of file path to mode.  path may contain
+     chmod [-h] mode path
+             Change permissions of file path to mode.  If the -h flag is
+             specified, then symlinks will not be followed.  path may contain
              glob(7) characters and may match multiple files.
 
-     chown own path
-             Change owner of file path to own.  path may contain glob(7)
+     chown [-h] own path
+             Change owner of file path to own.  If the -h flag is specified,
+             then symlinks will not be followed.  path may contain glob(7)
              characters and may match multiple files.  own must be a numeric
              UID.
 
@@ -376,4 +393,4 @@ SEE ALSO
      T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh-
      filexfer-00.txt, January 2001, work in progress material.
 
-OpenBSD 6.4                   September 20, 2018                   OpenBSD 6.4
+OpenBSD 6.5                    January 22, 2019                    OpenBSD 6.5