chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: simplify proc_cmdline() to reuse get_process_cmdline()
[elogind.git]
/
src
/
core
/
dbus.c
diff --git
a/src/core/dbus.c
b/src/core/dbus.c
index e7eee3c6d1ef3c132df824a9851fefdb96f7ae21..185057b624e31d1ac2fea781fc145a6d3ae0806f 100644
(file)
--- a/
src/core/dbus.c
+++ b/
src/core/dbus.c
@@
-211,7
+211,7
@@
failed:
}
#ifdef HAVE_SELINUX
}
#ifdef HAVE_SELINUX
-static int selinux_filter(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
+static int
mac_
selinux_filter(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
Manager *m = userdata;
const char *verb, *path;
Unit *u = NULL;
Manager *m = userdata;
const char *verb, *path;
Unit *u = NULL;
@@
-239,7
+239,7
@@
static int selinux_filter(sd_bus *bus, sd_bus_message *message, void *userdata,
if (object_path_startswith("/org/freedesktop/systemd1", path)) {
if (object_path_startswith("/org/freedesktop/systemd1", path)) {
- r = selinux_access_check(message, verb, error);
+ r =
mac_
selinux_access_check(message, verb, error);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-270,7
+270,7
@@
static int selinux_filter(sd_bus *bus, sd_bus_message *message, void *userdata,
if (!u)
return 0;
if (!u)
return 0;
- r = selinux_unit_access_check(u, message, verb, error);
+ r =
mac_
selinux_unit_access_check(u, message, verb, error);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-536,7
+536,7
@@
static int bus_setup_api_vtables(Manager *m, sd_bus *bus) {
assert(bus);
#ifdef HAVE_SELINUX
assert(bus);
#ifdef HAVE_SELINUX
- r = sd_bus_add_filter(bus, NULL, selinux_filter, m);
+ r = sd_bus_add_filter(bus, NULL,
mac_
selinux_filter, m);
if (r < 0) {
log_error("Failed to add SELinux access filter: %s", strerror(-r));
return r;
if (r < 0) {
log_error("Failed to add SELinux access filter: %s", strerror(-r));
return r;
@@
-659,7
+659,7
@@
static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void
return 0;
}
return 0;
}
- r = set_ensure_allocated(&m->private_buses,
trivial_hash_func, trivial_compare_func
);
+ r = set_ensure_allocated(&m->private_buses,
NULL
);
if (r < 0) {
log_oom();
return 0;
if (r < 0) {
log_oom();
return 0;