diff options
| author | Carlos Rodríguez Gili <carlos.rodriguez-gili@upc.edu> | 2021-04-20 19:23:57 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-05-25 10:24:42 +0200 |
| commit | 914f4ad138714c471ba72fb6d5496b6235320edd (patch) | |
| tree | f7e44d5a161966530a21b135408701ee16c1576f /contrib | |
| parent | Remove outdated comment (diff) | |
| download | openssh-914f4ad138714c471ba72fb6d5496b6235320edd.tar.xz openssh-914f4ad138714c471ba72fb6d5496b6235320edd.zip | |
Fix test error for /bin/sh on Solaris 10 and older
On Solaris 10 and older targets /bin/sh is not POSIX-compliant.
Test -z `...` fails with error 'sh: test: argument expected'.
Using quotes around backticks fixes this and doesn't break
POSIX compatibility.
SSH-Copy-ID-Upstream: 98394072a3f985b2650c1e8eab2fef84e38cc065
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ssh-copy-id | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index 9c9b0fa5f..171c4e06c 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id @@ -1,6 +1,7 @@ #!/bin/sh # Copyright (c) 1999-2023 Philip Hands <phil@hands.com> +# 2021 Carlos Rodríguez Gili <carlos.rodriguez-gili@upc.edu> # 2020 Matthias Blümel <blaimi@blaimi.de> # 2017 Sebastien Boyron <seb@boyron.eu> # 2013 Martin Kletzander <mkletzan@redhat.com> @@ -259,7 +260,7 @@ installkeys_sh() { AUTH_KEY_FILE=/etc/dropbear/authorized_keys; AUTH_KEY_DIR=\`dirname "\${AUTH_KEY_FILE}"\`; mkdir -p "\${AUTH_KEY_DIR}" && - { [ -z \`tail -1c "\${AUTH_KEY_FILE}" 2>/dev/null\` ] || + { [ -z "\`tail -1c "\${AUTH_KEY_FILE}" 2>/dev/null\`" ] || echo >> "\${AUTH_KEY_FILE}" || exit 1; } && cat >> "\${AUTH_KEY_FILE}" || exit 1; if type restorecon >/dev/null 2>&1; then |