tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (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@
This commit is contained in:
Damien Miller 2010-03-26 11:18:27 +11:00
parent ffd1eaadb0
commit df08341060
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -15,6 +15,8 @@
ok dtucker@ ok dtucker@
- (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using - (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using
pkg-config, patch from Colin Watson. Needed for newer linkers (ie gold). pkg-config, patch from Colin Watson. Needed for newer linkers (ie gold).
- (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@
20100324 20100324
- (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory

2
contrib/ssh-copy-id
View File

@ -19,7 +19,7 @@ if [ "-i" = "$1" ]; then
shift # and this should leave $1 as the target name shift # and this should leave $1 as the target name
fi fi
else else
if [ x$SSH_AUTH_SOCK != x ] ; then if [ x$SSH_AUTH_SOCK != x ] && ssh-add -L >/dev/null 2>&1; then
GET_ID="$GET_ID ssh-add -L" GET_ID="$GET_ID ssh-add -L"
fi fi
fi fi