summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-11 04:10:28 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-11 04:10:28 +0200
commit51bc5d4b84ba684463ea6e335a1d761d14aa76d8 (patch)
tree0df0fa01de42f44ffc1d1150ef0fc21800177719
parentc0bd0cf7ff0abdc8b51d58fbd7819ec54917be30 (diff)
dbus: get rid of last non-private busses
-rw-r--r--src/cgroups-agent.c6
-rw-r--r--src/dbus-common.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c
index 232b63e2da..d3db151b18 100644
--- a/src/cgroups-agent.c
+++ b/src/cgroups-agent.c
@@ -36,7 +36,7 @@ int main(int argc, char *argv[]) {
goto finish;
}
- if (!(bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error))) {
+ if (!(bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error))) {
log_error("Failed to get D-Bus connection: %s", error.message);
goto finish;
}
@@ -61,8 +61,10 @@ int main(int argc, char *argv[]) {
r = 0;
finish:
- if (bus)
+ if (bus) {
+ dbus_connection_close(bus);
dbus_connection_unref(bus);
+ }
if (m)
dbus_message_unref(m);
diff --git a/src/dbus-common.c b/src/dbus-common.c
index 267ab2646c..127da23bab 100644
--- a/src/dbus-common.c
+++ b/src/dbus-common.c
@@ -76,7 +76,7 @@ int bus_connect(DBusBusType t, DBusConnection **_bus, bool *private, DBusError *
*private = true;
} else {
- if (!(bus = dbus_bus_get(t, error)))
+ if (!(bus = dbus_bus_get_private(t, error)))
return -EIO;
if (private)