diff options
| author | Ray Strode <rstrode@redhat.com> | 2016-08-01 11:25:47 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2017-03-03 15:32:43 -0500 |
| commit | 4c7af60f82d145bdfd38722b0ca67d4244cfdc1f (patch) | |
| tree | f504e483b65c6de1b0c9a90fe3bf2f61c4558a8b | |
| parent | 9c5209f83f9bb3aebf63e1a8e50e6893c83570b2 (diff) | |
| download | gdm-4c7af60f82d145bdfd38722b0ca67d4244cfdc1f.tar.gz | |
manager: don't try to activate session if session not on seat
If a session is not associated with a seat (because it's remote),
then we shouldn't try to activate the session. Activating sessions,
really only means anything on seat0 (where it means to change
the active VT).
This prevents premature failure before unlock on XDMCP.
https://bugzilla.gnome.org/show_bug.cgi?id=779500
| -rw-r--r-- | daemon/gdm-manager.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c index 0cd5a918..35a7a0fe 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c @@ -618,10 +618,12 @@ switch_to_compatible_user_session (GdmManager *manager, if (existing_session != NULL) { ssid_to_activate = gdm_session_get_session_id (existing_session); - res = activate_session_id (manager, seat_id, ssid_to_activate); - if (! res) { - g_debug ("GdmManager: unable to activate session: %s", ssid_to_activate); - goto out; + if (seat_id != NULL) { + res = activate_session_id (manager, seat_id, ssid_to_activate); + if (! res) { + g_debug ("GdmManager: unable to activate session: %s", ssid_to_activate); + goto out; + } } res = session_unlock (manager, ssid_to_activate); |