Fix ssh-copy-id on non-sh shells (#1045191)

This commit is contained in:
Jakub Jelen 2015-02-18 16:01:02 +01:00
parent bb3e880c01
commit 6df422d544
2 changed files with 19 additions and 0 deletions

View File

@ -0,0 +1,16 @@
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 8e1091c..4bba5d6 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -274,9 +274,9 @@ case "$REMOTE_VERSION" in
populate_new_ids 0
fi
[ "$DRY_RUN" ] || printf '%s\n' "$NEW_IDS" | ssh "$@" "
- 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" \
+ 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)
;;

View File

@ -228,6 +228,8 @@ Patch920: openssh-6.6.1p1-ip-port-config-parser.patch
Patch921: openssh-6.7p1-debian-restore-tcp-wrappers.patch Patch921: openssh-6.7p1-debian-restore-tcp-wrappers.patch
# apply upstream patch and make sshd -T more consistent (#1187521) # apply upstream patch and make sshd -T more consistent (#1187521)
Patch922: openssh-6.7p1-sshdT-output.patch Patch922: openssh-6.7p1-sshdT-output.patch
# fix ssh-copy-id on non-sh shells (#1045191)
Patch923: openssh-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch
License: BSD License: BSD
@ -437,6 +439,7 @@ popd
%patch802 -p1 -b .GSSAPIEnablek5users %patch802 -p1 -b .GSSAPIEnablek5users
%patch921 -p1 -b .tcp_wrappers %patch921 -p1 -b .tcp_wrappers
%patch922 -p1 -b .sshdt %patch922 -p1 -b .sshdt
%patch923 -p1 -b .ssh-copy-id
%patch200 -p1 -b .audit %patch200 -p1 -b .audit
%patch700 -p1 -b .fips %patch700 -p1 -b .fips