diff options
| author | Philip Hands <phil@hands.com> | 2023-05-18 18:20:55 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-05-25 10:24:32 +0200 |
| commit | cf84498f67abe93f813a296167b406a0db7b288e (patch) | |
| tree | dfe4309653bfe5f9df0628831fd4c91348cde4f3 /contrib | |
| parent | update copyright notices (diff) | |
| download | openssh-cf84498f67abe93f813a296167b406a0db7b288e.tar.xz openssh-cf84498f67abe93f813a296167b406a0db7b288e.zip | |
ssh-copy-id: add -x option (for debugging)
This option causes the ssh-copy-id to run with set -x
SSH-Copy-ID-Upstream: a0ee367ea8c0a29c8b4515245e408d2d349e7844
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ssh-copy-id | 8 | ||||
| -rw-r--r-- | contrib/ssh-copy-id.1 | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index 8ef1cc4b4..f29377e8c 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id @@ -66,10 +66,11 @@ SSH="ssh -a -x" umask 0177 usage () { - printf 'Usage: %s [-h|-?|-f|-n|-s] [-i [identity_file]] [-p port] [-F alternative ssh_config file] [[-o <ssh -o options>] ...] [user@]hostname\n' "$0" >&2 + printf 'Usage: %s [-h|-?|-f|-n|-s|-x] [-i [identity_file]] [-p port] [-F alternative ssh_config file] [[-o <ssh -o options>] ...] [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 + printf '\t-x: debug -- enables -x in this shell, for debugging\n' >&2 printf '\t-h|-?: print this help\n' >&2 exit 1 } @@ -112,7 +113,7 @@ if [ -n "$SSH_AUTH_SOCK" ] && ssh-add -L >/dev/null 2>&1 ; then GET_ID="ssh-add -L" fi -while getopts "i:o:p:F:fnsh?" OPT +while getopts "i:o:p:F:fnsxh?" OPT do case "$OPT" in i) @@ -135,6 +136,9 @@ do s) SFTP=sftp ;; + x) + set -x + ;; h|\?) usage ;; diff --git a/contrib/ssh-copy-id.1 b/contrib/ssh-copy-id.1 index bf97e5541..79d976c77 100644 --- a/contrib/ssh-copy-id.1 +++ b/contrib/ssh-copy-id.1 @@ -32,6 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .Op Fl f .Op Fl n .Op Fl s +.Op Fl x .Op Fl i Op Ar identity_file .Op Fl p Ar port .Op Fl o Ar ssh_option @@ -91,6 +92,11 @@ With this option the user's .Pa ~/.ssh/authorized_keys file will be downloaded, modified locally and uploaded with sftp. This option is useful if the server has restrictions on commands which can be used on the remote side. +.It Fl x +This option is for debugging the +.Nm +script itself. +It sets the shell's -x flag, so that you can see the commands being run. .It Fl h , Fl ? Print Usage summary .It Fl p Ar port , Fl o Ar ssh_option |