13 lines
1.2 KiB
Diff
13 lines
1.2 KiB
Diff
|
diff -up openssh-7.9p1/contrib/ssh-copy-id.ssh-copy-id openssh-7.9p1/contrib/ssh-copy-id
|
||
|
|
--- openssh-7.9p1/contrib/ssh-copy-id.ssh-copy-id 2019-01-23 20:44:32.880912180 +0100
|
||
|
|
+++ openssh-7.9p1/contrib/ssh-copy-id 2019-01-23 20:44:24.512842410 +0100
|
||
|
|
@@ -296,7 +296,7 @@ case "$REMOTE_VERSION" in
|
||
|
|
# in ssh below - to defend against quirky remote shells: use 'exec sh -c' to get POSIX;
|
||
|
|
# 'cd' to be at $HOME; add a newline if it's missing; and all on one line, because tcsh.
|
||
|
|
[ "$DRY_RUN" ] || printf '%s\n' "$NEW_IDS" | \
|
||
|
|
- ssh "$@" "exec sh -c 'cd ; umask 077 ; mkdir -p .ssh && { [ -z "'`tail -1c .ssh/authorized_keys 2>/dev/null`'" ] || echo >> .ssh/authorized_keys ; } && cat >> .ssh/authorized_keys || exit 1 ; if type restorecon >/dev/null 2>&1 ; then restorecon -F .ssh .ssh/authorized_keys ; fi'" \
|
||
|
|
+ ssh "$@" "exec sh -c 'cd ; umask 077 ; mkdir -p .ssh && { [ -z "'`tail -1c .ssh/authorized_keys 2>/dev/null`'" ] || echo >> .ssh/authorized_keys || exit 1; } && cat >> .ssh/authorized_keys || exit 1 ; if type restorecon >/dev/null 2>&1 ; then restorecon -F .ssh .ssh/authorized_keys ; fi'" \
|
||
|
|
|| exit 1
|
||
|
|
ADDED=$(printf '%s\n' "$NEW_IDS" | wc -l)
|
||
|
|
;;
|