1ff636
From 61a6ce79defd59fee00cd2bc28d58f7c3e637ae2 Mon Sep 17 00:00:00 2001
1ff636
From: Lennart Poettering <lennart@poettering.net>
1ff636
Date: Thu, 23 Apr 2015 13:37:03 +0200
1ff636
Subject: [PATCH] sd-bus: don't inherit connection creds into message creds
1ff636
 when we have a direct connection
1ff636
1ff636
It's never a good idea, let's just not do it, not even on dierct
1ff636
connections.
1ff636
1ff636
Conflicts:
1ff636
	src/libsystemd/sd-bus/bus-socket.c
1ff636
1ff636
Cherry-picked from: 038f9863
1ff636
Related: #1230190
1ff636
---
1ff636
 src/libsystemd/sd-bus/bus-socket.c | 4 ++--
1ff636
 1 file changed, 2 insertions(+), 2 deletions(-)
1ff636
1ff636
diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
c62b8e
index d00cd014eb..a3c3a45b46 100644
1ff636
--- a/src/libsystemd/sd-bus/bus-socket.c
1ff636
+++ b/src/libsystemd/sd-bus/bus-socket.c
1ff636
@@ -900,8 +900,8 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) {
1ff636
         r = bus_message_from_malloc(bus,
1ff636
                                     bus->rbuffer, size,
1ff636
                                     bus->fds, bus->n_fds,
1ff636
-                                    !bus->bus_client && bus->ucred_valid ? &bus->ucred : NULL,
1ff636
-                                    !bus->bus_client && bus->label[0] ? bus->label : NULL,
1ff636
+                                    NULL,
1ff636
+                                    NULL,
1ff636
                                     &t);
1ff636
         if (r < 0) {
1ff636
                 free(b);