chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: unref buscreds on failure
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-control.c
diff --git
a/src/libsystemd/sd-bus/bus-control.c
b/src/libsystemd/sd-bus/bus-control.c
index 204aed9d04f86d58adc5e103e1a4925141f20bc4..ad372f6772c5b8a3b795f5636ad4ac1c96eac30c 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-control.c
+++ b/
src/libsystemd/sd-bus/bus-control.c
@@
-495,11
+495,9
@@
static int bus_get_owner_kdbus(
goto fail;
}
goto fail;
}
- if (!bus->cgroup_root) {
- r = cg_get_root_path(&bus->cgroup_root);
- if (r < 0)
- goto fail;
- }
+ r = bus_get_root_path(bus);
+ if (r < 0)
+ goto fail;
c->cgroup_root = strdup(bus->cgroup_root);
if (!c->cgroup_root) {
c->cgroup_root = strdup(bus->cgroup_root);
if (!c->cgroup_root) {
@@
-1196,7
+1194,6
@@
int bus_remove_match_internal(
uint64_t cookie) {
assert(bus);
uint64_t cookie) {
assert(bus);
- assert(match);
if (bus->is_kernel)
return bus_remove_match_internal_kernel(bus, cookie);
if (bus->is_kernel)
return bus_remove_match_internal_kernel(bus, cookie);