login: support more than just power-gpio-key

[elogind.git] / src / login / logind-session.c

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index c7033bd18434b4e9fe6decfb901b2c7d5ca6d5e7..01688680503be229efb951c0d31207d3712ca949 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -558,11 +558,11 @@ static int session_start_cgroup(Session *s) {
         assert(s->leader > 0);
 
         /* First, create our own group */
-        r = cg_create(ELOGIND_CGROUP_CONTROLLER, s->id);
+        r = cg_create(SYSTEMD_CGROUP_CONTROLLER, s->id);
         if (r < 0)
                 return log_error_errno(r, "Failed to create cgroup %s: %m", s->id);
 
-        r = cg_attach(ELOGIND_CGROUP_CONTROLLER, s->id, s->leader);
+        r = cg_attach(SYSTEMD_CGROUP_CONTROLLER, s->id, s->leader);
         if (r < 0)
                 log_warning_errno(r, "Failed to attach PID %d to cgroup %s: %m", s->leader, s->id);
 
@@ -984,8 +984,7 @@ static void session_remove_fifo(Session *s) {
 
         if (s->fifo_path) {
                 unlink(s->fifo_path);
-                free(s->fifo_path);
-                s->fifo_path = NULL;
+                s->fifo_path = mfree(s->fifo_path);
         }
 }
 
@@ -1013,7 +1012,7 @@ bool session_check_gc(Session *s, bool drop_not_started) {
 #endif // 0
 
         if ( s->user->manager
-          && (cg_is_empty_recursive (ELOGIND_CGROUP_CONTROLLER, s->user->manager->cgroup_root) > 0) )
+          && (cg_is_empty_recursive (SYSTEMD_CGROUP_CONTROLLER, s->user->manager->cgroup_root) > 0) )
                 return true;
 
         return false;
@@ -1074,7 +1073,7 @@ int session_kill(Session *s, KillWho who, int signo) {
                 bool sigcont = false;
                 bool ignore_self = true;
                 bool rem = true;
-                return cg_kill_recursive (ELOGIND_CGROUP_CONTROLLER, s->id, signo,
+                return cg_kill_recursive (SYSTEMD_CGROUP_CONTROLLER, s->id, signo,
                                           sigcont, ignore_self, rem, NULL);
         }
 #endif // 0