diff options
author | Darren Tucker <dtucker@zip.com.au> | 2016-03-14 09:24:03 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2016-03-14 09:24:03 +1100 |
commit | 8ff20ec95f4377021ed5e9b2331320f5c5a34cea (patch) | |
tree | 8e8e9687834057ac90b76044ba9185a0c25a2202 /contrib/ssh-copy-id | |
parent | 627824480c01f0b24541842c7206ab9009644d02 (diff) |
Quote variables that may contain whitespace.
The variable $L_TMP_ID_FILE needs to be surrounded by quotes in order to
survive paths containing whitespace. bz#2551, from Corinna Vinschen via
Philip Hands.
Diffstat (limited to 'contrib/ssh-copy-id')
-rw-r--r-- | contrib/ssh-copy-id | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index afde8b170..bef5c95d9 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id | |||
@@ -233,17 +233,17 @@ populate_new_ids() { | |||
233 | -o ControlPath=none \ | 233 | -o ControlPath=none \ |
234 | -o LogLevel=INFO \ | 234 | -o LogLevel=INFO \ |
235 | -o PreferredAuthentications=publickey \ | 235 | -o PreferredAuthentications=publickey \ |
236 | -o IdentitiesOnly=yes "$@" exit 2>$L_TMP_ID_FILE.stderr </dev/null | 236 | -o IdentitiesOnly=yes "$@" exit 2>"$L_TMP_ID_FILE.stderr" </dev/null |
237 | if [ "$?" = "$L_SUCCESS" ] ; then | 237 | if [ "$?" = "$L_SUCCESS" ] ; then |
238 | : > $L_TMP_ID_FILE | 238 | : > "$L_TMP_ID_FILE" |
239 | else | 239 | else |
240 | grep 'Permission denied' $L_TMP_ID_FILE.stderr >/dev/null || { | 240 | grep 'Permission denied' "$L_TMP_ID_FILE.stderr" >/dev/null || { |
241 | sed -e 's/^/ERROR: /' <$L_TMP_ID_FILE.stderr >$L_TMP_ID_FILE | 241 | sed -e 's/^/ERROR: /' <"$L_TMP_ID_FILE.stderr" >"$L_TMP_ID_FILE" |
242 | cat >/dev/null #consume the other keys, causing loop to end | 242 | cat >/dev/null #consume the other keys, causing loop to end |
243 | } | 243 | } |
244 | fi | 244 | fi |
245 | 245 | ||
246 | cat $L_TMP_ID_FILE | 246 | cat "$L_TMP_ID_FILE" |
247 | done | 247 | done |
248 | } | 248 | } |
249 | ) | 249 | ) |