summaryrefslogtreecommitdiff
path: root/debian/patches/ssh-copy-id-status-check.patch
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-04-16 10:25:59 +0100
committerColin Watson <cjwatson@debian.org>2010-04-16 10:25:59 +0100
commit716621abf50722a46f97ecafed5ce134c94f1a81 (patch)
tree9993f08b7ea89f3038c3cfcf8fd1c71bdc7e7ae7 /debian/patches/ssh-copy-id-status-check.patch
parentae31b42e02d7bf7004ec0302088f4e169c0f08ce (diff)
parent78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (diff)
* New upstream release:
- Unbreak sshd_config's AuthorizedKeysFile option for $HOME-relative paths. - Include a language tag when sending a protocol 2 disconnection message. - Make logging of certificates used for user authentication more clear and consistent between CAs specified using TrustedUserCAKeys and authorized_keys.
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, 0 insertions, 20 deletions
diff --git a/debian/patches/ssh-copy-id-status-check.patch b/debian/patches/ssh-copy-id-status-check.patch
deleted file mode 100644
index efc76d0fc..000000000
--- a/debian/patches/ssh-copy-id-status-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
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