Merge lp://qastaging/~kramsmada/ubuntu/vivid/gnupg2/1407513-gpg-agent-set-ssh-env-vars into lp://qastaging/ubuntu/vivid/gnupg2
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~kramsmada/ubuntu/vivid/gnupg2/1407513-gpg-agent-set-ssh-env-vars | ||||
| Merge into: | lp://qastaging/ubuntu/vivid/gnupg2 | ||||
| Diff against target: |
44 lines (+22/-0) 2 files modified
debian/changelog (+8/-0) debian/gpg-agent.user-session.upstart (+14/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~kramsmada/ubuntu/vivid/gnupg2/1407513-gpg-agent-set-ssh-env-vars | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marc Deslauriers | Approve | ||
|
Review via email:
|
|||
Description of the change
This fixes a bug I reported (LP: #1407513) which describes an issue where the upstart gpg-agent script only sets the GPG_AGENT_INFO environment variable when, in fact, it should also set SSH_AGENT_PID and SSH_AUTH_SOCK if "enable-
Essentially, this patch modifies the existing upstart script so that it checks to see if the "enable-
This fix mainly applies to users who store their SSH keys on a GPG smartcard and would like to easily make them available to SSH-based applications.
| Mark Adams (kramsmada) wrote | # |
Unmerged revisions
- 29. By Mark Adams
-
Updated debian/
gpg-agent. user-session. upstart so that global environment
variables SSH_AUTH_SOCK and SSH_AGENT_PID are set if gpg-agent is running
with SSH support.; LP: #1407513
I think the merge request looks good. Once the dev release opens, it can be uploaded.