do not run keychain when ssh auth forwarding is enabled

diff --git a/.profile.d/keychain.sh b/.profile.d/keychain.sh
index 89345492cc49c4fcf0ebdbe9336e4f7aa0695ff4..14a6289858052dfeee897fe159f1ab9ded37fd3b 100644 (file)
--- a/.profile.d/keychain.sh
+++ b/.profile.d/keychain.sh
@@ -1,5 +1,9 @@
-if type keychain >/dev/null 2>&1 ; then
-       : ${HOSTNAME:=$(hostname)}
-       [ -e ~/.keychain/${HOSTNAME}-sh ] && . ~/.keychain/${HOSTNAME}-sh
-       [ -e ~/.keychain/${HOSTNAME}-sh-gpg ] && . ~/.keychain/${HOSTNAME}-sh-gpg
+# If an auth sock is already set & available, use it.
+# This way ssh agent forwarding still works.
+if [ ! -S "${SSH_AUTH_SOCK}" ] ; then
+       if type keychain >/dev/null 2>&1 ; then
+               : ${HOSTNAME:=$(hostname)}
+               [ -e ~/.keychain/${HOSTNAME}-sh ] && . ~/.keychain/${HOSTNAME}-sh
+               [ -e ~/.keychain/${HOSTNAME}-sh-gpg ] && . ~/.keychain/${HOSTNAME}-sh-gpg
+       fi
 fi