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