X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/1ee519346fac51178b3e3e55565531f0cdd4d4be..5801e19944ce101762621feb7f1c0a4047897d59:/dot/bash_profile

diff --git a/dot/bash_profile b/dot/bash_profile
index 69fbebf..12f5f52 100644
--- a/dot/bash_profile
+++ b/dot/bash_profile
@@ -198,8 +198,16 @@ ulimit -S -c 0
 
 # --- Start an ssh authentication agent ---
 
-if stuff=$(gnome-keyring-daemon -s 2>/dev/null); then
-  eval "$stuff"; export GNOME_KEYRING_CONTROL SSH_AUTH_SOCK
+if { { [ "$GNOME_KEYRING_CONTROL" ] &&
+       [ -s "$GNOME_KEYRING_CONTROL" ]; } ||
+     { [ "$DBUS_SESSION_BUS_ADDRESS" ] &&
+       dbus-send --session --print-reply --dest=org.freedesktop.DBus \
+	 / org.freedesktop.DBus.GetNameOwner string:org.gnome.keyring \
+	 >/dev/null 2>/dev/null; }; } &&
+   stuff=$(gnome-keyring-daemon -s -c ssh 2>/dev/null)
+then
+  eval "$stuff"
+  export SSH_AUTH_SOCK
 fi
 
 eval `start-ssh-agent -b`