mirror of
https://gitlab.com/mateslackbuilds/msb.git
synced 2025-01-23 07:27:25 +01:00
66 lines
1.7 KiB
Diff
66 lines
1.7 KiB
Diff
|
From 254a091b31517a25bc037b31daff27fbb74ac90d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Victor Kareh <vkareh@redhat.com>
|
||
|
|
Date: Wed, 6 Mar 2019 09:20:36 -0500
|
||
|
|
Subject: Guard against missing systemd
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/mate-session/gsm-systemd.c b/mate-session/gsm-systemd.c
|
||
|
|
index da3f23b..d03cafd 100644
|
||
|
|
--- a/mate-session/gsm-systemd.c
|
||
|
|
+++ b/mate-session/gsm-systemd.c
|
||
|
|
@@ -429,16 +429,31 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager)
|
||
|
|
gboolean is_last_session;
|
||
|
|
int ret, i;
|
||
|
|
|
||
|
|
+#ifdef HAVE_SYSTEMD
|
||
|
|
ret = sd_pid_get_session (getpid (), &session);
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
+ if (session == NULL) {
|
||
|
|
+ return FALSE;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
if (ret != 0) {
|
||
|
|
+ free (session);
|
||
|
|
return FALSE;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#ifdef HAVE_SYSTEMD
|
||
|
|
ret = sd_uid_get_sessions (getuid (), FALSE, &sessions);
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
+ if (sessions == NULL) {
|
||
|
|
+ free (session);
|
||
|
|
+ return FALSE;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
if (ret <= 0) {
|
||
|
|
free (session);
|
||
|
|
+ free (sessions);
|
||
|
|
return FALSE;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -450,7 +465,9 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager)
|
||
|
|
if (g_strcmp0 (sessions[i], session) == 0)
|
||
|
|
continue;
|
||
|
|
|
||
|
|
+#ifdef HAVE_SYSTEMD
|
||
|
|
ret = sd_session_get_state (sessions[i], &state);
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
if (ret != 0)
|
||
|
|
continue;
|
||
|
|
@@ -461,7 +478,9 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager)
|
||
|
|
}
|
||
|
|
free (state);
|
||
|
|
|
||
|
|
+#ifdef HAVE_SYSTEMD
|
||
|
|
ret = sd_session_get_type (sessions[i], &type);
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
if (ret != 0)
|
||
|
|
continue;
|
||
|
|
--
|
||
|
|
cgit v0.10.2
|
||
|
|
|