[gdm/f14/master] Fix crash when automatic login is enabled
Ray Strode
rstrode at fedoraproject.org
Wed Aug 25 23:15:47 UTC 2010
commit 1e467db4b16237c6a0069567d91eb806e29ce7af
Author: Ray Strode <rstrode at redhat.com>
Date: Wed Aug 25 19:14:56 2010 -0400
Fix crash when automatic login is enabled
This fixes a bug in destroy_session which makes automaticlogin
crash.
gdm-multistack.patch | 202 +++++++++++++++++++++++++-------------------------
gdm.spec | 5 +-
2 files changed, 106 insertions(+), 101 deletions(-)
---
diff --git a/gdm-multistack.patch b/gdm-multistack.patch
index 871c21d..68f2e45 100644
--- a/gdm-multistack.patch
+++ b/gdm-multistack.patch
@@ -25,7 +25,7 @@ index 2994014..6b9159a 100644
static void
--
-1.7.2.1
+1.7.2.2
From 7ced60d18d4aed59060e260550bf7e1837018c93 Mon Sep 17 00:00:00 2001
@@ -59,7 +59,7 @@ index 9e3ae73..28c8404 100644
gtk_widget_hide (widget->priv->frame);
set_chooser_list_visible (widget, FALSE);
--
-1.7.2.1
+1.7.2.2
From 686cfe7fc5d691f31323751b57aa24f3034231aa Mon Sep 17 00:00:00 2001
@@ -141,7 +141,7 @@ index d8cf1cc..83375ed 100644
<child>
<object class="GtkHBox" id="auth-input-box">
--
-1.7.2.1
+1.7.2.2
From e2b84e687b0fd3ccd5e53b6dca5c24689c42ffcd Mon Sep 17 00:00:00 2001
@@ -197,7 +197,7 @@ index 11a6456..3f6fea3 100644
*/
void gdm_chooser_widget_loaded (GdmChooserWidget *widget);
--
-1.7.2.1
+1.7.2.2
From 19f14037c4e503c21d205e45cc3a3b3354a7c198 Mon Sep 17 00:00:00 2001
@@ -233,21 +233,21 @@ index 3715396..775f99b 100644
static void
--
-1.7.2.1
+1.7.2.2
-From f03a89dc0782aff6173b95ebc8e0ded678bcbb00 Mon Sep 17 00:00:00 2001
+From 0c706f20aac5759b2f6b6fc7f54aba6b0ae6c3ce Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 13 Jul 2010 22:42:43 -0400
Subject: [PATCH 06/35] disconnect signal handlers in destroy session
We don't want them firing as part of object destruction
---
- daemon/gdm-simple-slave.c | 102 ++++++++++++++++++++++++++++++++++++++++----
- 1 files changed, 92 insertions(+), 10 deletions(-)
+ daemon/gdm-simple-slave.c | 104 ++++++++++++++++++++++++++++++++++++++++----
+ 1 files changed, 94 insertions(+), 10 deletions(-)
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index 6b9159a..7187ea1 100644
+index 6b9159a..cd343c7 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -97,6 +97,7 @@ static void gdm_simple_slave_finalize (GObject *object);
@@ -275,12 +275,16 @@ index 6b9159a..7187ea1 100644
reset_session (GdmSimpleSlave *slave)
{
destroy_session (slave);
-@@ -780,6 +771,97 @@ create_new_session (GdmSimpleSlave *slave)
+@@ -780,6 +771,99 @@ create_new_session (GdmSimpleSlave *slave)
}
static void
+destroy_session (GdmSimpleSlave *slave)
+{
++ if (slave->priv->session == NULL) {
++ return;
++ }
++
+ g_signal_handlers_disconnect_by_func (slave->priv->session,
+ G_CALLBACK (on_session_conversation_started),
+ slave);
@@ -362,11 +366,9 @@ index 6b9159a..7187ea1 100644
+ G_CALLBACK (on_default_session_name_changed),
+ slave);
+
-+ if (slave->priv->session != NULL) {
-+ gdm_session_close (GDM_SESSION (slave->priv->session));
-+ g_object_unref (slave->priv->session);
-+ slave->priv->session = NULL;
-+ }
++ gdm_session_close (GDM_SESSION (slave->priv->session));
++ g_object_unref (slave->priv->session);
++ slave->priv->session = NULL;
+}
+
+static void
@@ -374,10 +376,10 @@ index 6b9159a..7187ea1 100644
GdmSimpleSlave *slave)
{
--
-1.7.2.1
+1.7.2.2
-From 211c78dbb4e45660da5e44c1c030661423d261ba Mon Sep 17 00:00:00 2001
+From fc8e33d9853fb42a738097f0552f4e1b43b6bb35 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 16 Jan 2009 11:00:08 -0500
Subject: [PATCH 07/35] Introduce new Conversation object
@@ -1414,7 +1416,7 @@ index fb199d3..00c2fa4 100644
const char *service_name);
void gdm_session_setup_for_user (GdmSession *session,
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index 7187ea1..bd1ecad 100644
+index cd343c7..7ccd601 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -176,7 +176,6 @@ reset_session (GdmSimpleSlave *slave)
@@ -1425,7 +1427,7 @@ index 7187ea1..bd1ecad 100644
}
static gboolean
-@@ -981,8 +980,6 @@ on_greeter_connected (GdmGreeterServer *greeter_server,
+@@ -983,8 +982,6 @@ on_greeter_connected (GdmGreeterServer *greeter_server,
g_debug ("GdmSimpleSlave: Greeter connected");
@@ -1462,10 +1464,10 @@ index 8bed085..9bfda86 100644
g_signal_connect (session,
"conversation-started",
--
-1.7.2.1
+1.7.2.2
-From d6e02a0b140b831adb0c7509eccb0e9039616b29 Mon Sep 17 00:00:00 2001
+From d88e3d3c3574a96afe3fd1c8008ee9582f6c2910 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Feb 2009 10:55:03 -0500
Subject: [PATCH 08/35] Rename session worker to the service it's managing
@@ -1651,10 +1653,10 @@ index d24f025..4833f23 100644
GPid gdm_session_worker_job_get_pid (GdmSessionWorkerJob *session_worker_job);
--
-1.7.2.1
+1.7.2.2
-From 23a4e811a336f275dd50536599ed9336b0c6a55b Mon Sep 17 00:00:00 2001
+From 267162d00a4807295d9a65daec94d806e675a615 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 16 Jan 2009 13:01:48 -0500
Subject: [PATCH 09/35] Make greeter/autologin session explicitly request PAM conversation
@@ -1825,7 +1827,7 @@ index f9c157f..7e2424a 100644
const char *text);
void gdm_greeter_server_default_language_name_changed (GdmGreeterServer *greeter_server,
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index bd1ecad..dc7b437 100644
+index 7ccd601..5bb5251 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -545,6 +545,7 @@ on_session_secret_info_query (GdmSession *session,
@@ -1889,7 +1891,7 @@ index bd1ecad..dc7b437 100644
}
static void
-@@ -894,6 +915,16 @@ on_greeter_session_died (GdmGreeterSession *greeter,
+@@ -896,6 +917,16 @@ on_greeter_session_died (GdmGreeterSession *greeter,
}
static void
@@ -1906,7 +1908,7 @@ index bd1ecad..dc7b437 100644
on_greeter_begin_verification (GdmGreeterServer *greeter_server,
GdmSimpleSlave *slave)
{
-@@ -1071,6 +1102,10 @@ start_greeter (GdmSimpleSlave *slave)
+@@ -1073,6 +1104,10 @@ start_greeter (GdmSimpleSlave *slave)
slave->priv->greeter_server = gdm_greeter_server_new (display_id);
g_signal_connect (slave->priv->greeter_server,
@@ -2012,10 +2014,10 @@ index d4ef77f..63de620 100644
return res;
--
-1.7.2.1
+1.7.2.2
-From 501504483329a0ddc74acb39456860f381b0e54e Mon Sep 17 00:00:00 2001
+From 9c4dda8ccab58f2873d0cdd48e196037cd4c4175 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 16 Jan 2009 15:18:31 -0500
Subject: [PATCH 10/35] Store multiple conversations in the session
@@ -5722,7 +5724,7 @@ index 00c2fa4..22c2ccb 100644
void gdm_session_select_session (GdmSession *session,
const char *session_name);
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index dc7b437..adcb94a 100644
+index 5bb5251..4f4f331 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -71,6 +71,8 @@ struct GdmSimpleSlavePrivate
@@ -6025,7 +6027,7 @@ index dc7b437..adcb94a 100644
"setup-complete",
G_CALLBACK (on_session_setup_complete),
slave);
-@@ -797,6 +841,9 @@ destroy_session (GdmSimpleSlave *slave)
+@@ -801,6 +845,9 @@ destroy_session (GdmSimpleSlave *slave)
G_CALLBACK (on_session_conversation_started),
slave);
g_signal_handlers_disconnect_by_func (slave->priv->session,
@@ -6035,7 +6037,7 @@ index dc7b437..adcb94a 100644
G_CALLBACK (on_session_setup_complete),
slave);
g_signal_handlers_disconnect_by_func (slave->priv->session,
-@@ -926,11 +973,12 @@ on_greeter_start_conversation (GdmGreeterServer *greeter_server,
+@@ -928,11 +975,12 @@ on_greeter_start_conversation (GdmGreeterServer *greeter_server,
static void
on_greeter_begin_verification (GdmGreeterServer *greeter_server,
@@ -6049,7 +6051,7 @@ index dc7b437..adcb94a 100644
}
static void
-@@ -946,21 +994,23 @@ on_greeter_begin_auto_login (GdmGreeterServer *greeter_server,
+@@ -948,21 +996,23 @@ on_greeter_begin_auto_login (GdmGreeterServer *greeter_server,
static void
on_greeter_begin_verification_for_user (GdmGreeterServer *greeter_server,
@@ -6075,7 +6077,7 @@ index dc7b437..adcb94a 100644
}
static void
-@@ -1023,18 +1073,20 @@ on_greeter_connected (GdmGreeterServer *greeter_server,
+@@ -1025,18 +1075,20 @@ on_greeter_connected (GdmGreeterServer *greeter_server,
static void
on_start_session_when_ready (GdmGreeterServer *session,
@@ -6665,10 +6667,10 @@ index 63de620..b7e7f1c 100644
static int
--
-1.7.2.1
+1.7.2.2
-From 1f97db74673d35527b8003978e6a0f5717de08f4 Mon Sep 17 00:00:00 2001
+From d230a78a749f42fd5215ee4e651888105e28c3f0 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 16:05:14 -0400
Subject: [PATCH 11/35] Return a different error code for "service won't work" than "auth failed"
@@ -6725,10 +6727,10 @@ index ee5465a..b1c8285 100644
GDM_SESSION_WORKER_ERROR_AUTHORIZING,
GDM_SESSION_WORKER_ERROR_OPENING_LOG_FILE,
--
-1.7.2.1
+1.7.2.2
-From c9f24aa63b98f8a1f0af578720802f406951414d Mon Sep 17 00:00:00 2001
+From 440f428b1afbb472fac647e2fa4682e081be671f Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 21:32:00 -0400
Subject: [PATCH 12/35] Emit "service-unavailable" from session when pam service refuses to work
@@ -6964,10 +6966,10 @@ index 22c2ccb..9636b92 100644
const char *service_name);
void (* setup_for_user) (GdmSession *session,
--
-1.7.2.1
+1.7.2.2
-From d498108160a5afe7e886016fd0e892f8d06e0fd4 Mon Sep 17 00:00:00 2001
+From 633789ad11b0475fbdba987692ec5ebb5143fe9b Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 21:38:52 -0400
Subject: [PATCH 13/35] Bubble service-unavailable up to greeter
@@ -7020,7 +7022,7 @@ index 5af32fd..ff1ff5d 100644
gboolean gdm_greeter_server_ready (GdmGreeterServer *greeter_server,
const char *service_name);
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index adcb94a..8e15584 100644
+index 4f4f331..6faeeb3 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -197,22 +197,6 @@ greeter_reset_timeout (GdmSimpleSlave *slave)
@@ -7087,7 +7089,7 @@ index adcb94a..8e15584 100644
"setup-complete",
G_CALLBACK (on_session_setup_complete),
slave);
-@@ -844,6 +833,9 @@ destroy_session (GdmSimpleSlave *slave)
+@@ -848,6 +837,9 @@ destroy_session (GdmSimpleSlave *slave)
G_CALLBACK (on_session_conversation_stopped),
slave);
g_signal_handlers_disconnect_by_func (slave->priv->session,
@@ -7098,10 +7100,10 @@ index adcb94a..8e15584 100644
slave);
g_signal_handlers_disconnect_by_func (slave->priv->session,
--
-1.7.2.1
+1.7.2.2
-From f2155acde772064f387e49932bd900962bb22f05 Mon Sep 17 00:00:00 2001
+From cd3fdb44fdea51277dbf1fa3bf9f470a657df626 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 21:46:39 -0400
Subject: [PATCH 14/35] Catch service-unavailable from server in client and propagate it
@@ -7177,10 +7179,10 @@ index 2f27503..917ca9c 100644
const char *service_name);
void (* reset) (GdmGreeterClient *client);
--
-1.7.2.1
+1.7.2.2
-From da4dae9c2483b74e7e949984f5c2fabd4ae683da Mon Sep 17 00:00:00 2001
+From 18877571d83bf9ff9a496f8caf18b3933c8a082d Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 5 Feb 2009 15:20:25 -0500
Subject: [PATCH 15/35] Queue a greeter reset when the user clicks cancel
@@ -7190,10 +7192,10 @@ Subject: [PATCH 15/35] Queue a greeter reset when the user clicks cancel
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index 8e15584..43eac10 100644
+index 6faeeb3..05972a4 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
-@@ -959,6 +959,9 @@ on_greeter_start_conversation (GdmGreeterServer *greeter_server,
+@@ -961,6 +961,9 @@ on_greeter_start_conversation (GdmGreeterServer *greeter_server,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: starting conversation with '%s' pam service'", service_name);
@@ -7203,7 +7205,7 @@ index 8e15584..43eac10 100644
gdm_session_start_conversation (GDM_SESSION (slave->priv->session),
service_name);
}
-@@ -969,6 +972,9 @@ on_greeter_begin_verification (GdmGreeterServer *greeter_server,
+@@ -971,6 +974,9 @@ on_greeter_begin_verification (GdmGreeterServer *greeter_server,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: begin verification");
@@ -7213,7 +7215,7 @@ index 8e15584..43eac10 100644
gdm_session_setup (GDM_SESSION (slave->priv->session),
service_name);
}
-@@ -979,6 +985,9 @@ on_greeter_begin_auto_login (GdmGreeterServer *greeter_server,
+@@ -981,6 +987,9 @@ on_greeter_begin_auto_login (GdmGreeterServer *greeter_server,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: begin auto login for user '%s'", username);
@@ -7223,7 +7225,7 @@ index 8e15584..43eac10 100644
gdm_session_setup_for_user (GDM_SESSION (slave->priv->session),
"gdm-autologin",
username);
-@@ -991,6 +1000,9 @@ on_greeter_begin_verification_for_user (GdmGreeterServer *greeter_server,
+@@ -993,6 +1002,9 @@ on_greeter_begin_verification_for_user (GdmGreeterServer *greeter_server,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: begin verification");
@@ -7233,7 +7235,7 @@ index 8e15584..43eac10 100644
gdm_session_setup_for_user (GDM_SESSION (slave->priv->session),
service_name,
username);
-@@ -1002,6 +1014,9 @@ on_greeter_answer (GdmGreeterServer *greeter_server,
+@@ -1004,6 +1016,9 @@ on_greeter_answer (GdmGreeterServer *greeter_server,
const char *text,
GdmSimpleSlave *slave)
{
@@ -7243,7 +7245,7 @@ index 8e15584..43eac10 100644
gdm_session_answer_query (GDM_SESSION (slave->priv->session), service_name, text);
}
-@@ -1010,6 +1025,9 @@ on_greeter_session_selected (GdmGreeterServer *greeter_server,
+@@ -1012,6 +1027,9 @@ on_greeter_session_selected (GdmGreeterServer *greeter_server,
const char *text,
GdmSimpleSlave *slave)
{
@@ -7253,7 +7255,7 @@ index 8e15584..43eac10 100644
gdm_session_select_session (GDM_SESSION (slave->priv->session), text);
}
-@@ -1018,6 +1036,9 @@ on_greeter_language_selected (GdmGreeterServer *greeter_server,
+@@ -1020,6 +1038,9 @@ on_greeter_language_selected (GdmGreeterServer *greeter_server,
const char *text,
GdmSimpleSlave *slave)
{
@@ -7263,7 +7265,7 @@ index 8e15584..43eac10 100644
gdm_session_select_language (GDM_SESSION (slave->priv->session), text);
}
-@@ -1026,6 +1047,9 @@ on_greeter_layout_selected (GdmGreeterServer *greeter_server,
+@@ -1028,6 +1049,9 @@ on_greeter_layout_selected (GdmGreeterServer *greeter_server,
const char *text,
GdmSimpleSlave *slave)
{
@@ -7273,7 +7275,7 @@ index 8e15584..43eac10 100644
gdm_session_select_layout (GDM_SESSION (slave->priv->session), text);
}
-@@ -1042,6 +1066,7 @@ on_greeter_cancel (GdmGreeterServer *greeter_server,
+@@ -1044,6 +1068,7 @@ on_greeter_cancel (GdmGreeterServer *greeter_server,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: Greeter cancelled");
@@ -7281,7 +7283,7 @@ index 8e15584..43eac10 100644
queue_greeter_reset (slave);
}
-@@ -1052,6 +1077,9 @@ on_greeter_connected (GdmGreeterServer *greeter_server,
+@@ -1054,6 +1079,9 @@ on_greeter_connected (GdmGreeterServer *greeter_server,
gboolean display_is_local;
g_debug ("GdmSimpleSlave: Greeter connected");
@@ -7291,7 +7293,7 @@ index 8e15584..43eac10 100644
g_object_get (slave,
"display-is-local", &display_is_local,
-@@ -1069,6 +1097,9 @@ on_start_session_when_ready (GdmGreeterServer *session,
+@@ -1071,6 +1099,9 @@ on_start_session_when_ready (GdmGreeterServer *session,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: Will start session when ready");
@@ -7301,7 +7303,7 @@ index 8e15584..43eac10 100644
slave->priv->start_session_when_ready = TRUE;
if (slave->priv->waiting_to_start_session) {
-@@ -1082,6 +1113,9 @@ on_start_session_later (GdmGreeterServer *session,
+@@ -1084,6 +1115,9 @@ on_start_session_later (GdmGreeterServer *session,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: Will start session when ready and told");
@@ -7312,10 +7314,10 @@ index 8e15584..43eac10 100644
}
--
-1.7.2.1
+1.7.2.2
-From f5179490872ab7335a672e7de108150ec4c145da Mon Sep 17 00:00:00 2001
+From 6a1a72cd49dc224ab5a4212e7a9935853731c274 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Nov 2009 13:35:26 -0500
Subject: [PATCH 16/35] Don't delay login for passwd -d users
@@ -7341,10 +7343,10 @@ index 95371b8..a0caff9 100644
g_debug ("GdmGreeterLoginWindow: Okay, we'll start the session anyway,"
"because the user isn't ever going to get an opportunity to"
--
-1.7.2.1
+1.7.2.2
-From 41a2faa25a9424f6f4c9cffde9ea996fef4919c9 Mon Sep 17 00:00:00 2001
+From 1c3b63a8ac87ee569ae1d8e626c208a38b590f68 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 30 Jan 2009 23:57:31 -0500
Subject: [PATCH 17/35] Add a plugin based extension system to greeter
@@ -12378,10 +12380,10 @@ index 1fccb90..7c344c9 100644
gui/user-switch-applet/gdm-entry-menu-item.c
gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
--
-1.7.2.1
+1.7.2.2
-From b5ea9d8c7671dbdcabdf76fa523d5bd339826628 Mon Sep 17 00:00:00 2001
+From a298f20f8a47763215b45e07afcb3e5d39f5c20b Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Aug 2010 18:25:50 -0400
Subject: [PATCH 18/35] squash with password
@@ -12443,10 +12445,10 @@ index 255283e..11a171c 100644
static void
--
-1.7.2.1
+1.7.2.2
-From 36baeff2c9b1b625301a342d183102f686444b90 Mon Sep 17 00:00:00 2001
+From c0eb496fc909661da80d9e0e28d1041dc6c401d3 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Aug 2010 11:13:10 -0400
Subject: [PATCH 19/35] task list fix
@@ -12493,10 +12495,10 @@ index a7f8c74..906938d 100644
button = g_object_get_data (G_OBJECT (task), "gdm-task-list-button");
--
-1.7.2.1
+1.7.2.2
-From 9b7b6cb2950c1ed71d0091d96027c4d2eb40e966 Mon Sep 17 00:00:00 2001
+From d2dec665069a5a3d2899b492b6beff7b245d2ce0 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 29 Jun 2010 14:13:35 -0400
Subject: [PATCH 20/35] Show cancel button after first message
@@ -12537,10 +12539,10 @@ index 36a6d21..5845c7b 100644
if (task != NULL) {
--
-1.7.2.1
+1.7.2.2
-From ceece80bd67dd943d1888b8b6cd0a14d0afe188b Mon Sep 17 00:00:00 2001
+From 649f3dde0dd320226a745bebc01bd53a450bdbde Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 11:13:10 -0400
Subject: [PATCH 21/35] Prevent start session signal handler from getting called multiple times
@@ -12573,10 +12575,10 @@ index 5845c7b..d0c0781 100644
static void
--
-1.7.2.1
+1.7.2.2
-From ff1cf4ba57e24b40ef74eaffb14bf842b1cd96a4 Mon Sep 17 00:00:00 2001
+From 965429573ae1d3c99061f1bc369f883fd65317a2 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Feb 2009 16:25:47 -0500
Subject: [PATCH 22/35] Add fingerprint plugin
@@ -13344,10 +13346,10 @@ index 7c344c9..dd08b21 100644
gui/user-switch-applet/gdm-entry-menu-item.c
gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
--
-1.7.2.1
+1.7.2.2
-From b186d5b4703e6c193e404925e2257d78261b6ba3 Mon Sep 17 00:00:00 2001
+From 516c35fc268333a047ca8f60c5e614971228ee81 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Feb 2009 16:25:47 -0500
Subject: [PATCH 23/35] Add smartcard plugin
@@ -16861,10 +16863,10 @@ index dd08b21..ed922a5 100644
gui/user-switch-applet/gdm-entry-menu-item.c
gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
--
-1.7.2.1
+1.7.2.2
-From 1b0996ab22621ae16faa847a940d3df36a837efe Mon Sep 17 00:00:00 2001
+From 4263f7ad304f1c816050404e0931a3f309cfa137 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Aug 2010 18:26:01 -0400
Subject: [PATCH 24/35] squash with smartcard
@@ -16902,10 +16904,10 @@ index b925f5e..b40a21c 100644
static void
--
-1.7.2.1
+1.7.2.2
-From 74292dc8bf5f84a83b4ff339b53f1430479fa2d9 Mon Sep 17 00:00:00 2001
+From 6a624b8704dcf331336d825aff4f13d2d7fdedd3 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 21 Apr 2009 10:25:18 -0400
Subject: [PATCH 25/35] When one PAM conversation wins, stop the others
@@ -17021,7 +17023,7 @@ index 5a604bf..41c7dc2 100644
static void
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index 43eac10..7725205 100644
+index 05972a4..a19d4b3 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -598,7 +598,7 @@ on_session_conversation_stopped (GdmSession *session,
@@ -17034,10 +17036,10 @@ index 43eac10..7725205 100644
service_name);
if (! res) {
--
-1.7.2.1
+1.7.2.2
-From 67a3f9ac9abc64c35c0d2b5b91a1ccc823f5b20d Mon Sep 17 00:00:00 2001
+From 85885ea63a754167cd23dd42161452477ae3a154 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 24 Jul 2009 14:41:48 -0400
Subject: [PATCH 26/35] KILL stuck processes if they don't die on TERM
@@ -17158,10 +17160,10 @@ index be85f30..8b93663 100644
if (WIFEXITED (exit_status) && (WEXITSTATUS (exit_status) != 0)) {
g_debug ("GdmSessionWorkerJob: Wait on child process failed");
--
-1.7.2.1
+1.7.2.2
-From ec1151e4c20d0cc61e7b0a0ccbcf82d589d93795 Mon Sep 17 00:00:00 2001
+From 137e48e93041c9ccf40856ad2198d0730a6c9b16 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 23 Oct 2009 17:39:19 -0400
Subject: [PATCH 27/35] Drop the other hiding stuff for now.
@@ -17192,10 +17194,10 @@ index 33708b9..f8cf845 100644
}
--
-1.7.2.1
+1.7.2.2
-From 871f015fb50b7192ebf3497b3b2b4741275e2d90 Mon Sep 17 00:00:00 2001
+From c1e486c395743ed855cdd723e8b1bdd7235926a4 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 13 Jul 2010 22:36:19 -0400
Subject: [PATCH 28/35] add better debug spew (needs squash)
@@ -17245,10 +17247,10 @@ index 41c7dc2..e4e4166 100644
conversation = find_conversation_by_name (impl, service_name);
--
-1.7.2.1
+1.7.2.2
-From f59d1a42aa6d874d9342915c0f1632dbcf905c11 Mon Sep 17 00:00:00 2001
+From 2f107f6fc833394aab02daaffca7bcb22acb2c01 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 13 Jul 2010 22:37:35 -0400
Subject: [PATCH 29/35] switch to proper mode when going to timed login
@@ -17271,10 +17273,10 @@ index d0c0781..217aac8 100644
show_widget (login_window, "conversation-list", FALSE);
gdm_task_list_foreach_task (GDM_TASK_LIST (login_window->priv->conversation_list),
--
-1.7.2.1
+1.7.2.2
-From 62d2a6eb5ff91892ad3b57b861fd4bcd274027b7 Mon Sep 17 00:00:00 2001
+From eaea5226939e884250bdb794e1395d72dcb22105 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 3 Aug 2010 15:21:26 -0400
Subject: [PATCH 30/35] Drop "Cancelling" message for plugin initiated cancels
@@ -17300,10 +17302,10 @@ index 217aac8..13798ff 100644
static gboolean
--
-1.7.2.1
+1.7.2.2
-From aedf0cf1393a47694691432b4c328ff242afd3a1 Mon Sep 17 00:00:00 2001
+From dfed6496bc45b069ca4a5fc880ee394153b7e457 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Aug 2010 18:11:27 -0400
Subject: [PATCH 31/35] drop code for label that doesn't exist anymore
@@ -17337,10 +17339,10 @@ index 13798ff..536d4bb 100644
/* If we don't have a user list jump straight to authenticate */
g_debug ("GdmGreeterLoginWindow: jumping straight to authenticate");
--
-1.7.2.1
+1.7.2.2
-From 388e0d6b74765907c9bc348269dfb9ee4b7a2105 Mon Sep 17 00:00:00 2001
+From 5d9d29165e56af9ddd166961e868fae781686647 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Aug 2010 18:03:52 -0400
Subject: [PATCH 32/35] Add delay when showing messages (needs split)
@@ -17803,10 +17805,10 @@ index b40a21c..5e234b9 100644
static void
--
-1.7.2.1
+1.7.2.2
-From 5e112d485929ce2c66c36677c7905530baf1fc92 Mon Sep 17 00:00:00 2001
+From 1e97652fd587074dcd3dda3f08527907e3994972 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Aug 2010 19:27:14 -0400
Subject: [PATCH 33/35] Drop cancelling message
@@ -17830,10 +17832,10 @@ index 2d7c400..904269c 100644
}
--
-1.7.2.1
+1.7.2.2
-From ade29eb7766e364273d4202f5a5339aeed11eb7f Mon Sep 17 00:00:00 2001
+From 8ff09c46e4881851b850602212d5d1015f1504c3 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Aug 2010 11:14:23 -0400
Subject: [PATCH 34/35] manage tasks outside of task list
@@ -18632,10 +18634,10 @@ index 904269c..ac00d62 100644
if (gdm_task_is_choosable (GDM_TASK (extension))) {
--
-1.7.2.1
+1.7.2.2
-From a37938a440ad84b334ae5a851884030409ccdc22 Mon Sep 17 00:00:00 2001
+From 212f47d46fd17da9e4b635064ed158395a69f40e Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 9 Aug 2010 18:09:19 -0400
Subject: [PATCH 35/35] hide task actions more aggressively
@@ -18667,5 +18669,5 @@ index ac00d62..31e599f 100644
return FALSE;
}
--
-1.7.2.1
+1.7.2.2
diff --git a/gdm.spec b/gdm.spec
index c65e69b..3870c18 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -15,7 +15,7 @@
Summary: The GNOME Display Manager
Name: gdm
Version: 2.31.90
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+
Group: User Interface/X
@@ -368,6 +368,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/ull || :
%{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
%changelog
+* Wed Aug 25 2010 Ray Strode <rstrode at redhat.com> 2.31.90-2
+- Fix crash when autologin is enabled
+
* Tue Aug 17 2010 Ray Strode <rstrode at redhat.com> 2.31.90-1
- Update to 2.31.90
More information about the scm-commits
mailing list