chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove SysV compat
[elogind.git]
/
src
/
core
/
dbus-manager.c
diff --git
a/src/core/dbus-manager.c
b/src/core/dbus-manager.c
index feca6e8b800a23f406f504363b173c5973276ac6..1b26e5556ad0973f6644e153f67de62b4addfae3 100644
(file)
--- a/
src/core/dbus-manager.c
+++ b/
src/core/dbus-manager.c
@@
-675,9
+675,6
@@
static int transient_aux_units_from_message(
return r;
while ((r = sd_bus_message_enter_container(message, 'r', "sa(sv)")) > 0) {
return r;
while ((r = sd_bus_message_enter_container(message, 'r', "sa(sv)")) > 0) {
- if (r <= 0)
- return r;
-
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
return r;
r = sd_bus_message_read(message, "s", &name);
if (r < 0)
return r;
@@
-1802,15
+1799,15
@@
static int method_disable_unit_files_generic(
assert(message);
assert(m);
assert(message);
assert(m);
- r =
mac_selinux_access_check(message, verb, error
);
+ r =
sd_bus_message_read_strv(message, &l
);
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_message_read
_strv(message, &l
);
+ r = sd_bus_message_read
(message, "b", &runtime
);
if (r < 0)
return r;
if (r < 0)
return r;
- r =
sd_bus_message_read(message, "b", &runtime
);
+ r =
mac_selinux_unit_access_check_strv(l, message, m, verb, error
);
if (r < 0)
return r;
if (r < 0)
return r;