From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 22 Jan 2025 15:24:17 +0000 (+0100)
Subject: user-record: make a NULL UserDBMatch be equivalent to no filtering
X-Git-Tag: v258-rc1~1503^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F36141%2Fhead;p=thirdparty%2Fsystemd.git

user-record: make a NULL UserDBMatch be equivalent to no filtering
---

diff --git a/src/shared/group-record.c b/src/shared/group-record.c
index 3aa26657185..6d696bdaaa3 100644
--- a/src/shared/group-record.c
+++ b/src/shared/group-record.c
@@ -346,7 +346,9 @@ bool group_record_matches_group_name(const GroupRecord *g, const char *group_nam
 
 int group_record_match(GroupRecord *h, const UserDBMatch *match) {
         assert(h);
-        assert(match);
+
+        if (!match)
+                return true;
 
         if (h->gid < match->gid_min || h->gid > match->gid_max)
                 return false;
diff --git a/src/shared/user-record.c b/src/shared/user-record.c
index 9feac30933f..ebdbb28065e 100644
--- a/src/shared/user-record.c
+++ b/src/shared/user-record.c
@@ -2694,7 +2694,9 @@ bool user_name_fuzzy_match(const char *names[], size_t n_names, char **matches)
 
 int user_record_match(UserRecord *u, const UserDBMatch *match) {
         assert(u);
-        assert(match);
+
+        if (!match)
+                return true;
 
         if (u->uid < match->uid_min || u->uid > match->uid_max)
                 return false;