From aed4e9045656eb7934e3171a6fe442f7df4c4180 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 22 Nov 2024 09:34:56 +0100 Subject: [PATCH] userbdctl: show 'mapped' user range only inside of userns Outside of userns the concept makes no sense, there cannot be users mapped from further outside. (cherry picked from commit e412fc5e042b8f642bcba42f5c175124583e05ae) --- src/userdb/userdbctl.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c index 1718419407..1ff7d946f0 100644 --- a/src/userdb/userdbctl.c +++ b/src/userdb/userdbctl.c @@ -23,6 +23,7 @@ #include "user-util.h" #include "userdb.h" #include "verbs.h" +#include "virt.h" static enum { OUTPUT_CLASSIC, @@ -130,10 +131,16 @@ static int show_user(UserRecord *ur, Table *table) { return 0; } +static bool test_show_mapped(void) { + /* Show mapped user range only in environments where user mapping is a thing. */ + return running_in_userns() > 0; +} + static const struct { uid_t first, last; const char *name; UserDisposition disposition; + bool (*test)(void); } uid_range_table[] = { { .first = 1, @@ -166,6 +173,7 @@ static const struct { .last = MAP_UID_MAX, .name = "mapped", .disposition = USER_REGULAR, + .test = test_show_mapped, }, }; @@ -180,6 +188,9 @@ static int table_add_uid_boundaries(Table *table, const UIDRange *p) { if (!uid_range_covers(p, i->first, i->last - i->first + 1)) continue; + if (i->test && !i->test()) + continue; + name = strjoin(special_glyph(SPECIAL_GLYPH_ARROW_DOWN), " begin ", i->name, " users ", special_glyph(SPECIAL_GLYPH_ARROW_DOWN)); @@ -538,6 +549,9 @@ static int table_add_gid_boundaries(Table *table, const UIDRange *p) { if (!uid_range_covers(p, i->first, i->last - i->first + 1)) continue; + if (i->test && !i->test()) + continue; + name = strjoin(special_glyph(SPECIAL_GLYPH_ARROW_DOWN), " begin ", i->name, " groups ", special_glyph(SPECIAL_GLYPH_ARROW_DOWN)); -- 2.25.1