summaryrefslogtreecommitdiff
path: root/contrib/ssh-copy-id
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-26 11:18:27 +1100
committerDamien Miller <djm@mindrot.org>2010-03-26 11:18:27 +1100
commitdf08341060fe956ec07514c75b93e7140d2ebda0 (patch)
tree9fdc88d5c5cfee7b281a267bf4e84e2e19b9ff94 /contrib/ssh-copy-id
parentffd1eaadb0b97c1f172ed0ec9eda51fd368617ae (diff)
- (djm) [contrib/ssh-copy-id] Don't blow up when the agent has no keys;
bz#1723 patch from Adeodato Simó via Colin Watson; ok dtucker@
Diffstat (limited to 'contrib/ssh-copy-id')
-rw-r--r--contrib/ssh-copy-id2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index df74d25c8..65c0a8cd8 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -19,7 +19,7 @@ if [ "-i" = "$1" ]; then
19 shift # and this should leave $1 as the target name 19 shift # and this should leave $1 as the target name
20 fi 20 fi
21else 21else
22 if [ x$SSH_AUTH_SOCK != x ] ; then 22 if [ x$SSH_AUTH_SOCK != x ] && ssh-add -L >/dev/null 2>&1; then
23 GET_ID="$GET_ID ssh-add -L" 23 GET_ID="$GET_ID ssh-add -L"
24 fi 24 fi
25fi 25fi