dbus: get rid of last non-private busses

diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c
index 232b63e2da9df263b804fcd05c86b79c8cf04622..d3db151b181f56b2b599b826e83781440877ead4 100644 (file)
--- a/src/cgroups-agent.c
+++ b/src/cgroups-agent.c
@@ -36,7 +36,7 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
                 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;
         }
                 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:
         r = 0;
 
 finish:

-        if (bus)
+        if (bus) {
+                dbus_connection_close(bus);

                 dbus_connection_unref(bus);
                 dbus_connection_unref(bus);

+        }

 
         if (m)
                 dbus_message_unref(m);
 
         if (m)
                 dbus_message_unref(m);

diff --git a/src/dbus-common.c b/src/dbus-common.c
index 267ab2646cc94d991eaefa50d0cd537e7d268822..127da23bab358664f6cda97bb6e05d8e0ee1ac51 100644 (file)
--- 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 {
                         *private = true;
 
         } else {

-                if (!(bus = dbus_bus_get(t, error)))
+                if (!(bus = dbus_bus_get_private(t, error)))

                         return -EIO;
 
                 if (private)
                         return -EIO;
 
                 if (private)