From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Apr 2015 11:37:03 +0000 (+0200)
Subject: sd-bus: don't inherit connection creds into message creds when we have a direct conne... 
X-Git-Tag: v220~330
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=038f9863e22295d0e22b3b79a6d54f7086525ba2;p=thirdparty%2Fsystemd.git

sd-bus: don't inherit connection creds into message creds when we have a direct connection

It's never a good idea, let's just not do it, not even on dierct
connections.
---

diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
index 6a55f9bfb48..94a5c04c8b7 100644
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -915,8 +915,8 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) {
         r = bus_message_from_malloc(bus,
                                     bus->rbuffer, size,
                                     bus->fds, bus->n_fds,
-                                    !bus->bus_client && bus->ucred_valid ? &bus->ucred : NULL,
-                                    !bus->bus_client && !isempty(bus->label) ? bus->label : NULL,
+                                    NULL,
+                                    NULL,
                                     &t);
         if (r < 0) {
                 free(b);