From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 23 Dec 2013 17:56:37 +0000 (+0100)
Subject: bus: when we are connected to a bus, then do not assume peer creds are useful as... 
X-Git-Tag: v209~688
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e7f7a1b0222c49fd4706a77bbdac59ac28a4ddbb

bus: when we are connected to a bus, then do not assume peer creds are useful as message creds
---

diff --git a/src/libsystemd-bus/bus-socket.c b/src/libsystemd-bus/bus-socket.c
index 1f5d98063..66924b29f 100644
--- a/src/libsystemd-bus/bus-socket.c
+++ b/src/libsystemd-bus/bus-socket.c
@@ -923,8 +923,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->ucred_valid ? &bus->ucred : NULL,
-                                    bus->label[0] ? bus->label : NULL,
+                                    !bus->bus_client && bus->ucred_valid ? &bus->ucred : NULL,
+                                    !bus->bus_client && bus->label[0] ? bus->label : NULL,
                                     &t);
         if (r < 0) {
                 free(b);