summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2013-09-18 15:04:17 -0400
committerRay Strode <rstrode@redhat.com>2013-09-20 12:01:01 -0400
commit54ce3c428154a2fcf546ade6136d6d126951eed3 (patch)
tree6aef2a9fdbebc54c3ba95ff09c64a768d2b1cc7d /utils
parent7abb53efa7419b024345c0ec72e81756c09e04d3 (diff)
downloadgdm-54ce3c428154a2fcf546ade6136d6d126951eed3.tar.gz
flexiserver: don't look at pam service name to find login screen
It changed a long time ago and we neglected to update it here, and checking the class is good enough anyway.
Diffstat (limited to 'utils')
-rw-r--r--utils/gdmflexiserver.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/utils/gdmflexiserver.c b/utils/gdmflexiserver.c
index cfeb1757..5a4d1ead 100644
--- a/utils/gdmflexiserver.c
+++ b/utils/gdmflexiserver.c
@@ -511,7 +511,6 @@ get_login_window_session_id_for_systemd (const char *seat_id,
gboolean ret;
int res, i;
char **sessions;
- char *service_id;
char *service_class;
char *state;
@@ -528,7 +527,6 @@ get_login_window_session_id_for_systemd (const char *seat_id,
}
for (i = 0; sessions[i]; i ++) {
-
res = sd_session_get_class (sessions[i], &service_class);
if (res < 0) {
g_debug ("failed to determine class of session %s: %s", sessions[i], strerror (-res));
@@ -556,22 +554,10 @@ get_login_window_session_id_for_systemd (const char *seat_id,
}
free (state);
- res = sd_session_get_service (sessions[i], &service_id);
- if (res < 0) {
- g_debug ("failed to determine service of session %s: %s", sessions[i], strerror (-res));
- ret = FALSE;
- goto out;
- }
-
- if (strcmp (service_id, "gdm-welcome") == 0) {
- *session_id = g_strdup (sessions[i]);
- ret = TRUE;
-
- free (service_id);
- goto out;
- }
+ *session_id = g_strdup (sessions[i]);
+ ret = TRUE;
+ break;
- free (service_id);
}
*session_id = NULL;