2 files changed, 7 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 332515dc7..4bfbbfb9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ openssh (1:6.6p1-1) UNRELEASED; urgency=medium
     - Japanese (thanks, victory).
     - German (thanks, Stephan Beck; closes: #742541).
     - Italian (thanks, Beatrice Torracca).
+  * Don't start ssh-agent from the Upstart user session job if something
+    like Xsession has already done so (based on work by Bruno Vasselle;
+    LP: #1244736).
 
   [ Matthew Vernon ]
   * CVE-2014-2653: Fix failure to check SSHFP records if server presents a
diff --git a/debian/ssh-agent.user-session.upstart b/debian/ssh-agent.user-session.upstart
index 8553e12f1..f127e221d 100644
--- a/debian/ssh-agent.user-session.upstart
+++ b/debian/ssh-agent.user-session.upstart
@@ -6,14 +6,18 @@ start on starting xsession-init
 pre-start script
     [ -e /etc/X11/Xsession.options ] || { stop; exit 0; }
     grep -q "^use-ssh-agent$" /etc/X11/Xsession.options || { stop; exit 0; }
+    [ -z "$SSH_AUTH_SOCK" ] || { stop; exit 0; }
 
     eval "$(ssh-agent)" >/dev/null
     initctl set-env --global SSH_AUTH_SOCK=$SSH_AUTH_SOCK
     initctl set-env --global SSH_AGENT_PID=$SSH_AGENT_PID
+    initctl set-env --global SSH_AGENT_LAUNCHER=upstart
 end script
 
 post-stop script
+    [ "$SSH_AGENT_LAUNCHER" = upstart ] || exit 0
     kill $SSH_AGENT_PID 2>/dev/null || true
     initctl unset-env --global SSH_AUTH_SOCK
     initctl unset-env --global SSH_AGENT_PID
+    initctl unset-env --global SSH_AGENT_LAUNCHER
 end script