Fix ssh-copy-id on non-sh shells (#1045191)
This commit is contained in:
parent
2bcb9f6f88
commit
efcbda1905
|
@ -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)
|
||||||
|
;;
|
|
@ -223,6 +223,8 @@ Patch918: openssh-6.6.1p1-log-in-chroot.patch
|
||||||
Patch919: openssh-6.6.1p1-scp-non-existing-directory.patch
|
Patch919: openssh-6.6.1p1-scp-non-existing-directory.patch
|
||||||
# Config parser shouldn't accept ip/port syntax (#1130733)
|
# Config parser shouldn't accept ip/port syntax (#1130733)
|
||||||
Patch920: openssh-6.6.1p1-ip-port-config-parser.patch
|
Patch920: openssh-6.6.1p1-ip-port-config-parser.patch
|
||||||
|
# fix ssh-copy-id on non-sh shells (#1045191)
|
||||||
|
Patch921: openssh-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
|
@ -437,6 +439,7 @@ popd
|
||||||
%patch919 -p1 -b .scp
|
%patch919 -p1 -b .scp
|
||||||
%patch920 -p1 -b .config
|
%patch920 -p1 -b .config
|
||||||
%patch802 -p1 -b .GSSAPIEnablek5users
|
%patch802 -p1 -b .GSSAPIEnablek5users
|
||||||
|
%patch921 -p1 -b .ssh-copy-id
|
||||||
|
|
||||||
%patch200 -p1 -b .audit
|
%patch200 -p1 -b .audit
|
||||||
%patch201 -p1 -b .audit-fps
|
%patch201 -p1 -b .audit-fps
|
||||||
|
|
Loading…
Reference in New Issue