From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 25 Sep 2017 09:23:59 +0000 (+0200)
Subject: shared/bus-util: format uid==-1 and gid==-1 as [not set]
X-Git-Tag: v235.1~81
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e967f5af047cdd82b7a3a9bd88359d75791e4189;p=elogind.git

shared/bus-util: format uid==-1 and gid==-1 as [not set]

$ systemctl show elogind-journald -p UID,GID
UID=4294967295
GID=4294967295

↓

$ systemctl show elogind-journald -p UID,GID
UID=[not set]
GID=[not set]

Just seeing the number is very misleading.

Fixes #6511.
---

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 33ab89b23..f3579d07e 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -813,7 +813,17 @@ int bus_print_property(const char *name, sd_bus_message *property, bool value, b
 
                 if (strstr(name, "UMask") || strstr(name, "Mode"))
                         print_property(name, "%04o", u);
-                else
+                else if (streq(name, "UID")) {
+                        if (u == UID_INVALID)
+                                print_property(name, "%s", "[not set]");
+                        else
+                                print_property(name, "%"PRIu32, u);
+                } else if (streq(name, "GID")) {
+                        if (u == GID_INVALID)
+                                print_property(name, "%s", "[not set]");
+                        else
+                                print_property(name, "%"PRIu32, u);
+                } else
                         print_property(name, "%"PRIu32, u);
 
                 return 1;