summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-10-24 17:29:01 (GMT)
committerLennart Poettering <lennart@poettering.net>2014-10-24 17:29:59 (GMT)
commit96343c3039020d55ee64fb4746abee483e05fc29 (patch)
tree2635ba5c9f289ac826a858db4183aaeeeb05dfb0
parent455cd8b137b8ef45d04889f2d967c562a097f1e6 (diff)
bus-proxy: it's OK if getpeercred doesn't workHEADmaster
We should use the data if we can (if stdin/stdout is an AF_UNIX socket), but still work if we can't (if stdin/stdout are pipes, like in the SSH case). This effectively reverts 55534fb5e4742b0db9ae5e1e0202c53804147697
-rw-r--r--src/bus-proxyd/bus-proxyd.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 11d0e28..8c1b6a5 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -1166,12 +1166,7 @@ int main(int argc, char *argv[]) {
sd_is_socket(out_fd, AF_UNIX, 0, 0) > 0;
if (is_unix) {
- r = getpeercred(in_fd, &ucred);
- if (r < 0) {
- log_error("Failed to get peer creds: %s", strerror(-r));
- goto finish;
- }
-
+ (void) getpeercred(in_fd, &ucred);
(void) getpeersec(in_fd, &peersec);
}