Commit a8896cca authored by Ray Strode's avatar Ray Strode

main: set SSH_AUTH_SOCK explicitly in wayland sessions

Until we can get a more complete environment variable
propagation story figured, implement a quick hack
for the most pressing one, SSH_AUTH_SOCK.

https://bugzilla.gnome.org/show_bug.cgi?id=738205
parent 3c26d87b
......@@ -349,6 +349,18 @@ main (int argc, char **argv)
*/
gsm_util_setenv ("XDG_MENU_PREFIX", "gnome-");
/* hack to fix keyring until we can reorder things in 3.20
* https://bugzilla.gnome.org/show_bug.cgi?id=738205
*/
if (g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "wayland") == 0 &&
g_getenv ("GSM_SKIP_SSH_AGENT_WORKAROUND") == NULL) {
char *ssh_socket;
ssh_socket = g_build_filename (g_get_user_runtime_dir (), "keyring", "ssh", NULL);
gsm_util_setenv ("SSH_AUTH_SOCK", ssh_socket);
g_free (ssh_socket);
}
gsm_util_set_autostart_dirs (override_autostart_dirs);
session_name = opt_session_name;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment