From 02ddd7ea077c990d9dc2f0cb87a500fc20b0c0bb Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 30 Oct 2013 13:30:40 -0400 Subject: slave: don't run initial-setup on remote displays GDM will run initial-setup if there are no configured user accounts on the system. We correctly skip checking if there are configured user accounts on remote XDMCP displays, but incorrectly, still run initial-setup. This commit makes sure we only every do any of the initial-setup logic in the local display code paths. https://bugzilla.gnome.org/show_bug.cgi?id=711180 --- daemon/gdm-simple-slave.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 217c33b1..bee6c379 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -1312,6 +1312,17 @@ static gboolean wants_initial_setup (GdmSimpleSlave *slave) { gboolean enabled = FALSE; + gboolean display_is_local = FALSE; + + g_object_get (G_OBJECT (slave), + "display-is-local", &display_is_local, + NULL); + + /* don't run initial-setup on remote displays + */ + if (!display_is_local) { + return FALSE; + } /* don't run if the system has existing users */ if (slave->priv->have_existing_user_accounts) { -- cgit v1.2.1