From b574246b4f8e4eb86c29c38c7df47b541b68188a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 11 Jul 2010 02:22:46 +0200
Subject: [PATCH] dbus: use private connections wherever possible

---
 src/dbus-common.c   |  2 +-
 src/initctl.c       |  8 ++------
 src/systemctl.c     | 10 +++++++---
 src/test-loopback.c |  1 +
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/dbus-common.c b/src/dbus-common.c
index 11d989d7..267ab264 100644
--- a/src/dbus-common.c
+++ b/src/dbus-common.c
@@ -62,7 +62,7 @@ int bus_connect(DBusBusType t, DBusConnection **_bus, bool *private, DBusError *
         /* If we are root, then let's not go via the bus */
         if (geteuid() == 0 && t == DBUS_BUS_SYSTEM) {
 
-                if (!(bus = dbus_connection_open("unix:abstract=/org/freedesktop/systemd1/private", error)))
+                if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", error)))
                         return -EIO;
 
                 if (bus_check_peercred(bus) < 0) {
diff --git a/src/initctl.c b/src/initctl.c
index 7241acb8..83a560a1 100644
--- a/src/initctl.c
+++ b/src/initctl.c
@@ -232,7 +232,7 @@ static void server_done(Server *s) {
                 close_nointr_nofail(s->epoll_fd);
 
         if (s->bus) {
-               dbus_connection_set_exit_on_disconnect(s->bus, FALSE);
+               dbus_connection_close(s->bus);
                dbus_connection_unref(s->bus);
         }
 }
@@ -297,14 +297,10 @@ static int server_init(Server *s, unsigned n_sockets) {
                 s->n_fifos ++;
         }
 
-        if (!(s->bus = dbus_connection_open("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
+        if (bus_connect(DBUS_BUS_SYSTEM, &s->bus, NULL, &error) < 0) {
                 log_error("Failed to get D-Bus connection: %s", error.message);
                 goto fail;
         }
-        if ((r = bus_check_peercred(s->bus)) < 0) {
-                log_error("Bus connection failed peer credential check: %s", strerror(-r));
-                goto fail;
-        }
 
         return 0;
 
diff --git a/src/systemctl.c b/src/systemctl.c
index 799f57d0..d9047177 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -3056,7 +3056,7 @@ static int talk_upstart(void) {
         if (utmp_get_runlevel(&previous, NULL) < 0)
                 previous = 'N';
 
-        if (!(bus = dbus_connection_open("unix:abstract=/com/ubuntu/upstart", &error))) {
+        if (!(bus = dbus_connection_open_private("unix:abstract=/com/ubuntu/upstart", &error))) {
                 if (dbus_error_has_name(&error, DBUS_ERROR_NO_SERVER)) {
                         r = 0;
                         goto finish;
@@ -3120,8 +3120,10 @@ finish:
         if (reply)
                 dbus_message_unref(reply);
 
-        if (bus)
+        if (bus) {
+                dbus_connection_close(bus);
                 dbus_connection_unref(bus);
+        }
 
         dbus_error_free(&error);
 
@@ -3444,8 +3446,10 @@ int main(int argc, char*argv[]) {
 
 finish:
 
-        if (bus)
+        if (bus) {
+                dbus_connection_close(bus);
                 dbus_connection_unref(bus);
+        }
 
         dbus_error_free(&error);
 
diff --git a/src/test-loopback.c b/src/test-loopback.c
index 478f2f61..74449871 100644
--- a/src/test-loopback.c
+++ b/src/test-loopback.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
+#include <fcntl.h>
 
 #include "loopback-setup.h"
 #include "util.h"
-- 
2.39.5