diff options
author | Adrian C. (anrxc) <anrxc@sysphere.org> | 2012-05-06 00:51:41 +0200 |
---|---|---|
committer | Adrian C. (anrxc) <anrxc@sysphere.org> | 2012-05-06 00:54:53 +0200 |
commit | 957c1a2599368d5cc628a67d7dcb48b951345481 (patch) | |
tree | 90a05f6ff4afe27c04a57bec05f69d32fa999b6e | |
parent | bd11f590ba1d5aadf7b5a77d5545abc5550df515 (diff) | |
download | dotfiles-957c1a2599368d5cc628a67d7dcb48b951345481.tar.xz |
xinitrc: multiple bugs in GPG Agent's SSH emulation, disable it
Multiple bugs persist in SSH emulation for 2+ years, preventing
addition of new keys, and sometimes unlocking of old ones. No
respones, no fixes, no patches: https://bugs.g10code.com/gnupg/issue1293
-rwxr-xr-x | xinitrc | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -69,12 +69,21 @@ xsetroot -cursor_name left_ptr # {{{ Autostart settings # -# Start the GnuPG agent and enable OpenSSH agent emulation +# Start the GnuPG agent but don't enable OpenSSH agent emulation if (pgrep -u "${USER}" gpg-agent); then eval `cat ${gnupglog}` eval `cut -d= -f1 ${gnupglog} | xargs echo export` else - eval `gpg-agent --enable-ssh-support --daemon` + #eval `gpg-agent --enable-ssh-support --daemon` + eval `gpg-agent --daemon` +fi + +# Start the SSH-Agent to replace broken GnuPG agent +if (pgrep -u "${USER}" ssh-agent); then + eval `cat ${HOME}/.keychain/${HOSTNAME}-sh` +else + eval `ssh-agent` + (sleep 15 && keychain -q --timeout 480 --agents ssh id_rsa_sysphere id_rsa_heroin)& fi # Start the GNU Emacs daemon |