]> err.no Git - systemd/commitdiff
logind: simplify session_activate() a bit
authorLennart Poettering <lennart@poettering.net>
Tue, 17 Jan 2012 13:02:47 +0000 (14:02 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 18 Jan 2012 12:56:02 +0000 (13:56 +0100)
src/login/logind-session.c
src/login/logind-user.c

index 58c70c3dbfb840c6b7855a5dfdf4a2fe0e62a822..e78af02f0590cd55c0747a6874bade9586732f28 100644 (file)
@@ -324,7 +324,6 @@ finish:
 
 int session_activate(Session *s) {
         int r;
-        Session *old_active;
 
         assert(s);
 
@@ -343,10 +342,7 @@ int session_activate(Session *s) {
         if (r < 0)
                 return r;
 
-        old_active = s->seat->active;
-        s->seat->active = s;
-
-        return seat_apply_acls(s->seat, old_active);
+        return seat_set_active(s->seat, s);
 }
 
 static int session_link_x11_socket(Session *s) {
index 432d6092f54d4c5c72f81bc5c9cb049221f3ed34..717f0e20a2c26adcfe8ac91e19d629a449600ba6 100644 (file)
@@ -299,6 +299,8 @@ static int user_create_cgroup(User *u) {
 static int user_start_service(User *u) {
         assert(u);
 
+        /* FIXME: Fill me in later ... */
+
         return 0;
 }