From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 11 Jul 2010 02:10:28 +0000 (+0200)
Subject: dbus: get rid of last non-private busses
X-Git-Tag: v3~44
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=51bc5d4b84ba684463ea6e335a1d761d14aa76d8

dbus: get rid of last non-private busses
---

diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c
index 232b63e2d..d3db151b1 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 267ab2646..127da23ba 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)