[systemd-commits] src/libsystemd-bus

Lennart Poettering lennart at kemper.freedesktop.org
Mon Dec 23 09:58:14 PST 2013


 src/libsystemd-bus/bus-socket.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e7f7a1b0222c49fd4706a77bbdac59ac28a4ddbb
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Dec 23 18:56:37 2013 +0100

    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 1f5d980..66924b2 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);



More information about the systemd-commits mailing list