mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-27 05:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

make sure that usage & man page match

Browse Source 
SSH-Copy-ID-Upstream: da5b1abe55b72a16e0430e7598e1573da01779c0
This commit is contained in:
Philip Hands 2024-08-08 13:03:51 +02:00 committed by Darren Tucker
parent cd0d681645
commit 1c3a714526
No known key found for this signature in database
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ssh-copy-id
View File

@ -68,7 +68,7 @@ TARGET_PATH=".ssh/authorized_keys"
umask 0177
usage () {
printf 'Usage: %s [-h|-?|-f|-n|-s|-x] [-i [identity_file]] [-p port] [-F alternative ssh_config file] [-t target_path] [[-o <ssh -o options>] ...] [user@]hostname\n' "$0" >&2
printf 'Usage: %s [-h|-?|-f|-n|-s|-x] [-i [identity_file]] [-t target_path] [-F ssh_config] [[-o ssh_option] ...] [-p port] [user@]hostname\n' "$0" >&2
printf '\t-f: force mode -- copy keys without trying to check if they are already installed\n' >&2
printf '\t-n: dry run -- no keys are actually copied\n' >&2
printf '\t-s: use sftp -- use sftp instead of executing remote-commands. Can be useful if the remote only allows sftp\n' >&2

17
contrib/ssh-copy-id.1
View File

@ -34,9 +34,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.Op Fl s
.Op Fl x
.Op Fl i Op Ar identity_file
.Op Fl p Ar port
.Op Fl o Ar ssh_option
.Op Fl t Ar target_path
.Op Fl F Ar ssh_config
.Op Bo Fl o Ar ssh_option Bc ...
.Op Fl p Ar port
.Op Ar user Ns @ Ns
.Ar hostname
.Nm
@ -104,11 +105,13 @@ on commands which can be used on the remote side.
.It Fl t Ar target_path
the path on the target system where the keys should be added
(defaults to ".ssh/authorized_keys")
.It Fl p Ar port , Fl o Ar ssh_option
These two options are simply passed through untouched, along with their
argument, to allow one to set the port or other
.Xr ssh 1
options, respectively.
.It Fl p Ar port
Specifies the port to connect to on the remote host.
.It Fl F Ar ssh_config , Fl o Ar ssh_option
These options are simply passed through untouched (with their argument)
to ssh/sftp,
allowing one to set an alternative config file,
or other options, respectively.
.Pp
Rather than specifying these as command line options,
it is often better to use (per-host) settings in