Set variables required for test mode

diff --git a/src/seat.c b/src/seat.c
index 75335019a6af34512855ba951c2fd4df4aa987f5..9ae31d40fc1fe4cf1b69622c394726db8c9c73cb 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -578,6 +578,20 @@ session_stopped_cb (Session *session, Seat *seat)
 static void
 set_session_env (Session *session)
 {
+    /* Connect using the session bus */
+    if (getuid () != 0)
+    {
+        if (g_getenv ("DBUS_SESSION_BUS_ADDRESS"))
+            session_set_env (session, "DBUS_SESSION_BUS_ADDRESS", g_getenv ("DBUS_SESSION_BUS_ADDRESS"));
+        session_set_env (session, "LDM_BUS", "SESSION");
+        if (g_getenv ("LD_PRELOAD"))
+            session_set_env (session, "LD_PRELOAD", g_getenv ("LD_PRELOAD"));
+        if (g_getenv ("LD_LIBRARY_PATH"))
+            session_set_env (session, "LD_LIBRARY_PATH", g_getenv ("LD_LIBRARY_PATH"));
+        if (g_getenv ("PATH"))
+            session_set_env (session, "PATH", g_getenv ("PATH"));
+    }
+
     /* Variables required for regression tests */
     if (g_getenv ("LIGHTDM_TEST_ROOT"))
     {