rpms
/
openssh
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ssh-copy-id: tcsh doesnt work with multiline strings so we will make it uggly one-line

This commit is contained in:
Jakub Jelen 2015-07-01 19:05:41 +02:00
parent 1f82f4e6c3
commit 90469031ee
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openssh-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch
View File

@ -2,15 +2,14 @@ diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 8e1091c..4bba5d6 100644 index 8e1091c..4bba5d6 100644
--- a/contrib/ssh-copy-id --- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id
@@ -274,9 +274,9 @@ case "$REMOTE_VERSION" in @@ -274,9 +274,7 @@ case "$REMOTE_VERSION" in
populate_new_ids 0 populate_new_ids 0
fi fi
[ "$DRY_RUN" ] || printf '%s\n' "$NEW_IDS" | ssh "$@" " [ "$DRY_RUN" ] || printf '%s\n' "$NEW_IDS" | ssh "$@" "
- umask 077 ; - umask 077 ;
+ exec sh -c 'umask 077 ; + exec sh -c 'umask 077; mkdir -p .ssh && cat >> .ssh/authorized_keys || exit 1; if type restorecon >/dev/null 2>&1; then restorecon -F .ssh .ssh/authorized_keys; fi'" \
mkdir -p .ssh && cat >> .ssh/authorized_keys || exit 1 ; - mkdir -p .ssh && cat >> .ssh/authorized_keys || exit 1 ;
- if type restorecon >/dev/null 2>&1 ; then restorecon -F .ssh .ssh/authorized_keys ; fi" \ - if type restorecon >/dev/null 2>&1 ; then restorecon -F .ssh .ssh/authorized_keys ; fi" \
+ if type restorecon >/dev/null 2>&1 ; then restorecon -F .ssh .ssh/authorized_keys ; fi'" \
|| exit 1 || exit 1
ADDED=$(printf '%s\n' "$NEW_IDS" | wc -l) ADDED=$(printf '%s\n' "$NEW_IDS" | wc -l)
;; ;;