|
Zbigniew Jędrzejewski-Szmek |
436654 |
From 643f845bf882489eeddeeb4d9115b07b39198693 Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
From: Lennart Poettering <lennart@poettering.net>
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
Date: Wed, 10 Jun 2015 15:51:40 +0200
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
Subject: [PATCH] sd-bus: fix early exit when we lack all data in
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
bus_get_owner_creds_dbus1()
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
(cherry picked from commit 3c42e8b281b092b4d10f24c80e21d69b0f232b96)
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
---
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
src/libsystemd/sd-bus/bus-control.c | 2 +-
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
index 43ddfc651d..b4ca177f76 100644
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
--- a/src/libsystemd/sd-bus/bus-control.c
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
+++ b/src/libsystemd/sd-bus/bus-control.c
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
@@ -980,7 +980,7 @@ static int bus_get_owner_creds_dbus1(sd_bus *bus, uint64_t mask, sd_bus_creds **
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
pid_t pid = 0;
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
int r;
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
- if (!bus->ucred_valid && !isempty(bus->label))
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
+ if (!bus->ucred_valid && isempty(bus->label))
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
return -ENODATA;
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
|
|
Zbigniew Jędrzejewski-Szmek |
436654 |
c = bus_creds_new();
|