summaryrefslogtreecommitdiff
path: root/debian/patches/ssh-copy-id-status-check.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/ssh-copy-id-status-check.patch')
-rw-r--r--debian/patches/ssh-copy-id-status-check.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/debian/patches/ssh-copy-id-status-check.patch b/debian/patches/ssh-copy-id-status-check.patch
new file mode 100644
index 000000000..efc76d0fc
--- /dev/null
+++ b/debian/patches/ssh-copy-id-status-check.patch
@@ -0,0 +1,20 @@
1Description: ssh-copy-id: Check exit status of 'ssh-add -L'
2 This fixes behaviour when an agent is running with no identities loaded.
3Author: Adeodato Simó <asp16@alu.ua.es>
4Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1723
5Bug-Debian: http://bugs.debian.org/221675
6Last-Update: 2010-03-01
7
8Index: b/contrib/ssh-copy-id
9===================================================================
10--- a/contrib/ssh-copy-id
11+++ b/contrib/ssh-copy-id
12@@ -19,7 +19,7 @@
13 shift # and this should leave $1 as the target name
14 fi
15 else
16- if [ x$SSH_AUTH_SOCK != x ] ; then
17+ if [ x$SSH_AUTH_SOCK != x ] && ssh-add -L >/dev/null 2>&1; then
18 GET_ID="$GET_ID ssh-add -L"
19 fi
20 fi