Prep v234.2: Apply upstream fixes in src/login (5/6)

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 62d68b9072613f94842233e330668d3f5c9a713d..eb23ec0ba32e64a748f81f7ef4c79734b60da58a 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -1433,9 +1433,11 @@ static int help(int argc, char *argv[], void *userdata) {
                "  -i --ignore-inhibitors   When shutting down or sleeping, ignore inhibitors\n\n"
 #endif // 0
                "Session Commands:\n"
-#if 1 /// elogind has "list" as a shorthand for "list-sessions"
+#if 0 /// elogind has "list" as a shorthand for "list-sessions"
+               "  list-sessions            List sessions\n"
+#else
                "  list[-sessions]          List sessions (default command)\n"
-#endif // 1
+#endif // 0
                "  session-status [ID...]   Show session status\n"
                "  show-session [ID...]     Show properties of sessions or the manager\n"
                "  activate [ID]            Activate a session\n"

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 10e9327c0f2e41289843aba2044bda9d8de7a18a..74807d3fdba42bfaa959e004033436971ea93437 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -771,7 +771,6 @@ int session_stop(Session *s, bool force) {
 #if 1 /// elogind must queue this session again
         session_add_to_gc_queue(s);
 #endif // 1
-
         return r;
 }
 

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index ae1d8b6bd369a683a362c9ec77db9f86b0af0640..f904ad083b9d0c97d0dc772ad22b9831e1613bf5 100644 (file)
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -616,7 +616,6 @@ int user_stop(User *u, bool force) {
 #if 1 /// elogind must queue this user again
         user_add_to_gc_queue(u);
 #endif // 1
-
         return r;
 }