|
 |
ca70cf |
From be25f936f6568af9019bf446c3cf2a19de5e167f Mon Sep 17 00:00:00 2001
|
|
|
ca70cf |
From: Ray Strode <rstrode@localhost.localdomain>
|
|
|
ca70cf |
Date: Fri, 12 May 2017 15:20:14 -0400
|
|
|
ca70cf |
Subject: [PATCH] worker: add compat patch to make new worker work with old
|
|
|
ca70cf |
daemon
|
|
|
ca70cf |
|
|
|
ca70cf |
---
|
|
|
ca70cf |
daemon/gdm-session-worker.c | 17 +++++++++++++++++
|
|
|
ca70cf |
1 file changed, 17 insertions(+)
|
|
|
ca70cf |
|
|
|
ca70cf |
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
|
|
|
ca70cf |
index 10ecccb0..f71594c2 100644
|
|
|
ca70cf |
--- a/daemon/gdm-session-worker.c
|
|
|
ca70cf |
+++ b/daemon/gdm-session-worker.c
|
|
|
ca70cf |
@@ -3140,69 +3140,86 @@ gdm_session_worker_handle_setup_for_user (GdmDBusWorker *object,
|
|
|
ca70cf |
static gboolean
|
|
|
ca70cf |
gdm_session_worker_handle_setup_for_program (GdmDBusWorker *object,
|
|
|
ca70cf |
GDBusMethodInvocation *invocation,
|
|
|
ca70cf |
const char *service,
|
|
|
ca70cf |
const char *username,
|
|
|
ca70cf |
const char *x11_display_name,
|
|
|
ca70cf |
const char *x11_authority_file,
|
|
|
ca70cf |
const char *console,
|
|
|
ca70cf |
const char *seat_id,
|
|
|
ca70cf |
const char *hostname,
|
|
|
ca70cf |
gboolean display_is_local,
|
|
|
ca70cf |
const char *log_file)
|
|
|
ca70cf |
{
|
|
|
ca70cf |
GdmSessionWorker *worker = GDM_SESSION_WORKER (object);
|
|
|
ca70cf |
validate_and_queue_state_change (worker, invocation, GDM_SESSION_WORKER_STATE_SETUP_COMPLETE);
|
|
|
ca70cf |
|
|
|
ca70cf |
worker->priv->service = g_strdup (service);
|
|
|
ca70cf |
worker->priv->x11_display_name = g_strdup (x11_display_name);
|
|
|
ca70cf |
worker->priv->x11_authority_file = g_strdup (x11_authority_file);
|
|
|
ca70cf |
worker->priv->display_device = g_strdup (console);
|
|
|
ca70cf |
worker->priv->display_seat_id = g_strdup (seat_id);
|
|
|
ca70cf |
worker->priv->hostname = g_strdup (hostname);
|
|
|
ca70cf |
worker->priv->display_is_local = display_is_local;
|
|
|
ca70cf |
worker->priv->username = g_strdup (username);
|
|
|
ca70cf |
worker->priv->log_file = g_strdup (log_file);
|
|
|
ca70cf |
worker->priv->is_program_session = TRUE;
|
|
|
ca70cf |
|
|
|
ca70cf |
return TRUE;
|
|
|
ca70cf |
}
|
|
|
ca70cf |
|
|
|
ca70cf |
+static void
|
|
|
ca70cf |
+fix_environment_if_old_gdm_daemon_running (GdmSessionWorker *worker)
|
|
|
ca70cf |
+{
|
|
|
ca70cf |
+ const char *daemon_version;
|
|
|
ca70cf |
+ const char *username;
|
|
|
ca70cf |
+
|
|
|
ca70cf |
+ daemon_version = gdm_session_worker_get_environment_variable (worker, "GDM_VERSION");
|
|
|
ca70cf |
+ username = gdm_session_worker_get_environment_variable (worker, "USERNAME");
|
|
|
ca70cf |
+
|
|
|
ca70cf |
+ if (g_strcmp0 (daemon_version, "3.14.2") == 0 &&
|
|
|
ca70cf |
+ g_strcmp0 (username, "gdm") == 0) {
|
|
|
ca70cf |
+ gdm_session_worker_set_environment_variable (worker, "GNOME_SHELL_SESSION_MODE", "gdm");
|
|
|
ca70cf |
+ }
|
|
|
ca70cf |
+}
|
|
|
ca70cf |
+
|
|
|
ca70cf |
static gboolean
|
|
|
ca70cf |
gdm_session_worker_handle_start_program (GdmDBusWorker *object,
|
|
|
ca70cf |
GDBusMethodInvocation *invocation,
|
|
|
ca70cf |
const char *text)
|
|
|
ca70cf |
{
|
|
|
ca70cf |
GdmSessionWorker *worker = GDM_SESSION_WORKER (object);
|
|
|
ca70cf |
GError *parse_error = NULL;
|
|
|
ca70cf |
validate_state_change (worker, invocation, GDM_SESSION_WORKER_STATE_SESSION_STARTED);
|
|
|
ca70cf |
|
|
|
ca70cf |
+ fix_environment_if_old_gdm_daemon_running (worker);
|
|
|
ca70cf |
+
|
|
|
ca70cf |
if (worker->priv->is_reauth_session) {
|
|
|
ca70cf |
g_dbus_method_invocation_return_error (invocation,
|
|
|
ca70cf |
GDM_SESSION_WORKER_ERROR,
|
|
|
ca70cf |
GDM_SESSION_WORKER_ERROR_IN_REAUTH_SESSION,
|
|
|
ca70cf |
"Cannot start a program while in a reauth session");
|
|
|
ca70cf |
return TRUE;
|
|
|
ca70cf |
}
|
|
|
ca70cf |
|
|
|
ca70cf |
g_debug ("GdmSessionWorker: start program: %s", text);
|
|
|
ca70cf |
|
|
|
ca70cf |
g_clear_pointer (&worker->priv->arguments, (GDestroyNotify) g_strfreev);
|
|
|
ca70cf |
if (! g_shell_parse_argv (text, NULL, &worker->priv->arguments, &parse_error)) {
|
|
|
ca70cf |
g_dbus_method_invocation_take_error (invocation, parse_error);
|
|
|
ca70cf |
return TRUE;
|
|
|
ca70cf |
}
|
|
|
ca70cf |
|
|
|
ca70cf |
worker->priv->pending_invocation = invocation;
|
|
|
ca70cf |
queue_state_change (worker);
|
|
|
ca70cf |
|
|
|
ca70cf |
return TRUE;
|
|
|
ca70cf |
}
|
|
|
ca70cf |
|
|
|
ca70cf |
static void
|
|
|
ca70cf |
on_reauthentication_client_connected (GdmSession *session,
|
|
|
ca70cf |
GCredentials *credentials,
|
|
|
ca70cf |
GPid pid_of_client,
|
|
|
ca70cf |
ReauthenticationRequest *request)
|
|
|
ca70cf |
{
|
|
|
ca70cf |
g_debug ("GdmSessionWorker: client connected to reauthentication server");
|
|
|
ca70cf |
}
|
|
|
ca70cf |
--
|
|
|
ca70cf |
2.14.2
|
|
|
ca70cf |
|