summaryrefslogtreecommitdiff
path: root/src/libsystemd/sd-bus
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-04-23 13:37:03 +0200
committerLennart Poettering <lennart@poettering.net>2015-04-23 13:40:54 +0200
commit038f9863e22295d0e22b3b79a6d54f7086525ba2 (patch)
treec25b4f0e980d804e7547fcae862c29590bca7f26 /src/libsystemd/sd-bus
parent3f72b427b44f39a1aec6806dad6f6b57103ae9ed (diff)
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.
Diffstat (limited to 'src/libsystemd/sd-bus')
-rw-r--r--src/libsystemd/sd-bus/bus-socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
index 6a55f9bfb4..94a5c04c8b 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);