Accepting request 254673 from home:WernerFink:branches:network

- Ensure that ssh can use the ssh support of the gpg-agent (boo#899647)

OBS-URL: https://build.opensuse.org/request/show/254673
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=86
This commit is contained in:
Andrey Karepin 2014-10-11 07:28:34 +00:00 committed by Git OBS Bridge
parent 9913e17746
commit de58418da6
2 changed files with 12 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 8 10:12:40 UTC 2014 - werner@suse.de
- Ensure that ssh can use the ssh support of the gpg-agent (boo#899647)
-------------------------------------------------------------------
Mon Jul 21 15:58:09 UTC 2014 - p.drouand@gmail.com

View File

@ -24,6 +24,13 @@ if [ -z "$SESSION" ] ; then
fi
fi
if [ -n "$SSH_AUTH_SOCK" ] ; then
# Ensure that ssh can use the ssh support of the gpg-agent
case "$SSH_AUTH_SOCK" in
*/S.gpg-agent.ssh) gpg-connect-agent /bye < /dev/null ;;
esac
fi
GNOME_SSH_ASKPASS="@LIBEXECDIR@/ssh/gnome-ssh-askpass"
KDE_SSH_ASKPASS="@LIBEXECDIR@/ssh/ksshaskpass"
X11_SSH_ASKPASS="@LIBEXECDIR@/ssh/x11-ssh-askpass"