X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Fuser-sessions.c;h=91531e8f380048c117156d1f2a59947e5c9c089a;hp=df46b76c872842597597e1661da4b7e29ec1a329;hb=2a7cccf065c73abfe263d9c0b24bab24b6e68f29;hpb=927f62bd54ee1c70b1c855b7def84169b950b5d0

diff --git a/src/login/user-sessions.c b/src/login/user-sessions.c
index df46b76c8..91531e8f3 100644
--- a/src/login/user-sessions.c
+++ b/src/login/user-sessions.c
@@ -6,16 +6,16 @@
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
@@ -35,7 +35,7 @@ int main(int argc, char*argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+        log_set_target(LOG_TARGET_AUTO);
         log_parse_environment();
         log_open();
 
@@ -69,17 +69,18 @@ int main(int argc, char*argv[]) {
                 int r, q;
                 char *cgroup_user_tree = NULL;
 
-                if ((r = write_one_line_file_atomic("/run/nologin", "System is going down.")) < 0)
+                r = write_one_line_file_atomic("/run/nologin", "System is going down.");
+                if (r < 0)
                         log_error("Failed to create /run/nologin: %s", strerror(-r));
 
-                if ((q = cg_get_user_path(&cgroup_user_tree)) < 0) {
+                q = cg_get_user_path(&cgroup_user_tree);
+                if (q < 0) {
                         log_error("Failed to determine use path: %s", strerror(-q));
                         goto finish;
                 }
 
                 q = cg_kill_recursive_and_wait(SYSTEMD_CGROUP_CONTROLLER, cgroup_user_tree, true);
                 free(cgroup_user_tree);
-
                 if (q < 0) {
                         log_error("Failed to kill sessions: %s", strerror(-q));
                         goto finish;