chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: no need to pass bus object to selinux access check calls anymore
[elogind.git]
/
src
/
core
/
dbus-unit.c
diff --git
a/src/core/dbus-unit.c
b/src/core/dbus-unit.c
index 07e7f20e6b185a7f92e8d45b779a3e6d565eb412..8f23fe76ce6a807a0844f4517ad8f6fcfa12fe6b 100644
(file)
--- a/
src/core/dbus-unit.c
+++ b/
src/core/dbus-unit.c
@@
-436,7
+436,7
@@
int bus_unit_method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, s
if (signo <= 0 || signo >= _NSIG)
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Signal number out of range.");
if (signo <= 0 || signo >= _NSIG)
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Signal number out of range.");
- r = selinux_unit_access_check(u,
bus,
message, "stop", error);
+ r = selinux_unit_access_check(u, message, "stop", error);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-455,7
+455,7
@@
int bus_unit_method_reset_failed(sd_bus *bus, sd_bus_message *message, void *use
assert(message);
assert(u);
assert(message);
assert(u);
- r = selinux_unit_access_check(u,
bus,
message, "reload", error);
+ r = selinux_unit_access_check(u, message, "reload", error);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-476,7
+476,7
@@
int bus_unit_method_set_properties(sd_bus *bus, sd_bus_message *message, void *u
if (r < 0)
return r;
if (r < 0)
return r;
- r = selinux_unit_access_check(u,
bus,
message, "start", error);
+ r = selinux_unit_access_check(u, message, "start", error);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-737,7
+737,7
@@
int bus_unit_queue_job(
}
r = selinux_unit_access_check(
}
r = selinux_unit_access_check(
- u,
bus,
message,
+ u, message,
(type == JOB_START || type == JOB_RESTART || type == JOB_TRY_RESTART) ? "start" :
type == JOB_STOP ? "stop" : "reload", error);
if (r < 0)
(type == JOB_START || type == JOB_RESTART || type == JOB_TRY_RESTART) ? "start" :
type == JOB_STOP ? "stop" : "reload", error);
if (r < 0)