logind: load SELinux labelling system

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

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 209e62b676ad65f85b7e6b7f523f14785fb66780..a54071800f28c5574442ad0e737ab924f1c2e431 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1117,7 +1117,7 @@ static int method_set_user_linger(sd_bus_message *message, void *userdata, sd_bu
         errno = 0;
         pw = getpwuid(uid);
         if (!pw)
         errno = 0;
         pw = getpwuid(uid);
         if (!pw)

-                return errno ? -errno : -ENOENT;
+                return errno > 0 ? -errno : -ENOENT;

 
         r = bus_verify_polkit_async(
                         message,
 
         r = bus_verify_polkit_async(
                         message,


@@ -1235,7 +1235,6 @@ static int attach_device(Manager *m, const char *seat, const char *sysfs) {
                 return -ENOMEM;
 
         mkdir_p_label("/etc/udev/rules.d", 0755);
                 return -ENOMEM;
 
         mkdir_p_label("/etc/udev/rules.d", 0755);

-        mac_selinux_init("/etc");

         r = write_string_file_atomic_label(file, rule);
         if (r < 0)
                 return r;
         r = write_string_file_atomic_label(file, rule);
         if (r < 0)
                 return r;


@@ -1532,6 +1531,10 @@ static int execute_shutdown_or_sleep(
                         "ss", NULL, "replace-irreversibly");
 #else
         r = shutdown_or_sleep(m, action);
                         "ss", NULL, "replace-irreversibly");
 #else
         r = shutdown_or_sleep(m, action);

+
+        /* no more pending actions, whether this failed or not */
+        m->pending_action = HANDLE_IGNORE;
+        m->action_what    = 0;

 #endif // 0
         if (r < 0)
                 return r;
 #endif // 0
         if (r < 0)
                 return r;


@@ -1861,7 +1864,7 @@ static int nologin_timeout_handler(
 
         log_info("Creating /run/nologin, blocking further logins...");
 
 
         log_info("Creating /run/nologin, blocking further logins...");
 

-        r = write_string_file("/run/nologin", "System is going down.", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC);
+        r = write_string_file_atomic_label("/run/nologin", "System is going down.");

         if (r < 0)
                 log_error_errno(r, "Failed to create /run/nologin: %m");
         else
         if (r < 0)
                 log_error_errno(r, "Failed to create /run/nologin: %m");
         else


@@ -1985,9 +1988,9 @@ static int method_schedule_shutdown(sd_bus_message *message, void *userdata, sd_
                 action_multiple_sessions = "org.freedesktop.login1.halt-multiple-sessions";
                 action_ignore_inhibit = "org.freedesktop.login1.halt-ignore-inhibit";
         } else if (streq(type, "poweroff")) {
                 action_multiple_sessions = "org.freedesktop.login1.halt-multiple-sessions";
                 action_ignore_inhibit = "org.freedesktop.login1.halt-ignore-inhibit";
         } else if (streq(type, "poweroff")) {

-                action = "org.freedesktop.login1.poweroff";
-                action_multiple_sessions = "org.freedesktop.login1.poweroff-multiple-sessions";
-                action_ignore_inhibit = "org.freedesktop.login1.poweroff-ignore-inhibit";
+                action = "org.freedesktop.login1.power-off";
+                action_multiple_sessions = "org.freedesktop.login1.power-off-multiple-sessions";
+                action_ignore_inhibit = "org.freedesktop.login1.power-off-ignore-inhibit";

         } else
                 return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unsupported shutdown type");
 
         } else
                 return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unsupported shutdown type");