Solve issue with ssh-copy-id and keys without trailing newline (#1093168)
This commit is contained in:
parent
edabae2a71
commit
00050d05ad
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
|
||||||
|
index 4bba5d6..ed1208e 100644
|
||||||
|
--- a/contrib/ssh-copy-id
|
||||||
|
+++ b/contrib/ssh-copy-id
|
||||||
|
@@ -207,7 +207,7 @@ populate_new_ids() {
|
||||||
|
printf '%s: INFO: attempting to log in with the new key(s), to filter out any that are already installed\n' "$0" >&2
|
||||||
|
NEW_IDS=$(
|
||||||
|
eval $GET_ID | {
|
||||||
|
- while read ID ; do
|
||||||
|
+ while read ID || [[ -n $ID ]]; do
|
||||||
|
printf '%s\n' "$ID" > $L_TMP_ID_FILE
|
||||||
|
|
||||||
|
# the next line assumes $PRIV_ID_FILE only set if using a single id file - this
|
|
@ -224,6 +224,8 @@ Patch919: openssh-6.6.1p1-scp-non-existing-directory.patch
|
||||||
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)
|
# fix ssh-copy-id on non-sh shells (#1045191)
|
||||||
Patch921: openssh-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch
|
Patch921: openssh-6.7p1-fix-ssh-copy-id-on-non-sh-shell.patch
|
||||||
|
# Solve issue with ssh-copy-id and keys without trailing newline (#1093168)
|
||||||
|
Patch922: openssh-6.7p1-ssh-copy-id-truncated-keys.patch
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
|
@ -438,6 +440,7 @@ popd
|
||||||
%patch920 -p1 -b .config
|
%patch920 -p1 -b .config
|
||||||
%patch802 -p1 -b .GSSAPIEnablek5users
|
%patch802 -p1 -b .GSSAPIEnablek5users
|
||||||
%patch921 -p1 -b .ssh-copy-id
|
%patch921 -p1 -b .ssh-copy-id
|
||||||
|
%patch922 -p1 -b .newline
|
||||||
|
|
||||||
%patch200 -p1 -b .audit
|
%patch200 -p1 -b .audit
|
||||||
%patch201 -p1 -b .audit-fps
|
%patch201 -p1 -b .audit-fps
|
||||||
|
|
Loading…
Reference in New Issue