diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-03-26 01:58:14 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-03-26 02:19:34 +0100 |
| commit | d65ddaa40e60f91d4b29fdb37224b95675af896f (patch) | |
| tree | 9d68227e3a373a304a3c1d062e1f699ec8f447bb /src | |
| parent | 0a72c2bdef69bae5f4677ee563019e3ccbd3dfe2 (diff) | |
bus: when we are talking to a bus, SCM_CREDS/SCM_SECLABEL are not very useful
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsystemd-bus/bus-socket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd-bus/bus-socket.c b/src/libsystemd-bus/bus-socket.c index f40aa59f51..4f1fd94548 100644 --- a/src/libsystemd-bus/bus-socket.c +++ b/src/libsystemd-bus/bus-socket.c @@ -206,8 +206,8 @@ static int bus_socket_setup(sd_bus *b) { assert(b); - /* Enable SO_PASSCRED + SO_PASSEC. We try this on any socket, - * just in case. This is actually irrelavant for */ + /* Enable SO_PASSCRED + SO_PASSEC. We try this on any + * socket, just in case. */ one = 1; setsockopt(b->fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)); setsockopt(b->fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one)); @@ -467,8 +467,8 @@ static int bus_socket_make_message(sd_bus *bus, size_t size, sd_bus_message **m) r = bus_message_from_malloc(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); |