[systemd-commits] src/libsystemd-bus

Kay Sievers kay at kemper.freedesktop.org
Fri Nov 29 10:47:47 PST 2013


 src/libsystemd-bus/bus-creds.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 197941a8d5d74d79ca45ae73ec114939a8e88244
Author: Kay Sievers <kay at vrfy.org>
Date:   Fri Nov 29 19:46:59 2013 +0100

    bus: do not fail if task information cannot be retrieved from /proc

diff --git a/src/libsystemd-bus/bus-creds.c b/src/libsystemd-bus/bus-creds.c
index 9518f02..22f204f 100644
--- a/src/libsystemd-bus/bus-creds.c
+++ b/src/libsystemd-bus/bus-creds.c
@@ -643,10 +643,10 @@ int bus_creds_add_more(sd_bus_creds *c, uint64_t mask, pid_t pid, pid_t tid) {
                         return -ENOMEM;
 
                 r = read_one_line_file(p, &c->tid_comm);
-                if (r < 0)
+                if (r < 0 && r != -ENOENT)
                         return r == -ENOENT ? -ESRCH : r;
-
-                c->mask |= SD_BUS_CREDS_TID_COMM;
+                else if (r >= 0)
+                        c->mask |= SD_BUS_CREDS_TID_COMM;
         }
 
         if (missing & (SD_BUS_CREDS_CGROUP|SD_BUS_CREDS_UNIT|SD_BUS_CREDS_USER_UNIT|SD_BUS_CREDS_SLICE|SD_BUS_CREDS_SESSION|SD_BUS_CREDS_OWNER_UID)) {



More information about the systemd-commits mailing list