diff options
author | Lennart Poettering <lennart@poettering.net> | 2012-01-17 14:02:47 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2012-01-18 13:56:02 +0100 |
commit | 129eebe020118fc1bf0274c9ea75ffb6178a280f (patch) | |
tree | eb25cc804d61ad9ea6939e43e6608a0e2ef82e1b | |
parent | abc5bbc6f0ac1edeebec251c4fb3583a4222fb08 (diff) |
logind: simplify session_activate() a bit
-rw-r--r-- | src/login/logind-session.c | 6 | ||||
-rw-r--r-- | src/login/logind-user.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 58c70c3dbf..e78af02f05 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -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) { diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 432d6092f5..717f0e20a2 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -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; } |