summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2014-04-07 10:13:10 -0400
committerRay Strode <rstrode@redhat.com>2014-04-07 10:13:10 -0400
commite1206752ed525422a0f9b4509aa3562f472c9bac (patch)
tree978d14bc9fc1bdea289117762eae70d20650c0e7
parentbbc08d3456ce77de1eae63b6f321a9256d54d873 (diff)
downloadgdm-e1206752ed525422a0f9b4509aa3562f472c9bac.tar.gz
worker: don't run shell scripts for program sessions
GDM uses a worker to manage PAM for user sessions and greeter sessions. For the latter case we shouldn't run the various Pre/Post scripts, but commit Sb48a305e71637181975fc7ec479a71079b6fbc broke that. This commit changes the code to prevent those scripts from getting run again. https://bugzilla.gnome.org/show_bug.cgi?id=727703
-rw-r--r--daemon/gdm-session-worker.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index a0cbfb51..8493fbd0 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -1594,6 +1594,11 @@ static gboolean
run_script (GdmSessionWorker *worker,
const char *dir)
{
+ /* scripts are for non-program sessions only */
+ if (worker->priv->is_program_session) {
+ return TRUE;
+ }
+
return gdm_run_script (dir,
worker->priv->username,
worker->priv->x11_display_name,