diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-09-25 11:23:59 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-09-25 11:23:59 +0200 |
| commit | c533658a1c2f6a62e437117f37ce5ecdfd11a695 (patch) | |
| tree | 471ea2aebceb67203ed5423f777b26b6e7ab483f /src/shared/bus-util.c | |
| parent | basic/cap-list: report empty capability set as "" (diff) | |
| download | systemd-c533658a1c2f6a62e437117f37ce5ecdfd11a695.tar.xz systemd-c533658a1c2f6a62e437117f37ce5ecdfd11a695.zip | |
shared/bus-util: format uid==-1 and gid==-1 as [not set]
$ systemctl show systemd-journald -p UID,GID
UID=4294967295
GID=4294967295
↓
$ systemctl show systemd-journald -p UID,GID
UID=[not set]
GID=[not set]
Just seeing the number is very misleading.
Fixes #6511.
Diffstat (limited to 'src/shared/bus-util.c')
| -rw-r--r-- | src/shared/bus-util.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 48752c5fea..a9a763c1ca 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -809,7 +809,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; |