summaryrefslogtreecommitdiff
path: root/xinitrc
diff options
context:
space:
mode:
authorAdrian C. (anrxc) <anrxc@sysphere.org>2012-05-05 22:51:41 (GMT)
committerAdrian C. (anrxc) <anrxc@sysphere.org>2012-05-05 22:54:53 (GMT)
commit957c1a2599368d5cc628a67d7dcb48b951345481 (patch)
tree90a05f6ff4afe27c04a57bec05f69d32fa999b6e /xinitrc
parentbd11f590ba1d5aadf7b5a77d5545abc5550df515 (diff)
downloaddotfiles-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
Diffstat (limited to 'xinitrc')
-rwxr-xr-xxinitrc13
1 files changed, 11 insertions, 2 deletions
diff --git a/xinitrc b/xinitrc
index 157a17b..25e91d0 100755
--- a/xinitrc
+++ b/xinitrc
@@ -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