From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 22 Apr 2015 11:27:29 +0000 (+0200)
Subject: sd-bus: handle ppid=0 more gracefully (which happens for pid=1)
X-Git-Tag: v220~351
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a698817043ca8f4059c52b7ff30097462b1f7bc;p=thirdparty%2Fsystemd.git

sd-bus: handle ppid=0 more gracefully (which happens for pid=1)
---

diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
index 6cb47f55cef..a68b0d00edd 100644
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -768,11 +768,14 @@ int bus_creds_add_more(sd_bus_creds *c, uint64_t mask, pid_t pid, pid_t tid) {
                                         if (p) {
                                                 p += strspn(p, WHITESPACE);
 
-                                                r = parse_pid(p, &c->ppid);
-                                                if (r < 0)
-                                                        return r;
+                                                /* Explicitly check for PPID 0 (which is the case for PID 1) */
+                                                if (!streq(p, "0")) {
+                                                        r = parse_pid(p, &c->ppid);
+                                                        if (r < 0)
+                                                                return r;
 
-                                                c->mask |= SD_BUS_CREDS_PPID;
+                                                        c->mask |= SD_BUS_CREDS_PPID;
+                                                }
                                                 continue;
                                         }
                                 }