From 40fb3503f45447f37214fdd7f27946dc57a65925 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 5 May 2021 22:27:37 +0200 Subject: [PATCH] userdb: initialize .synthesize_root/.synthesize_nobody in generic code Let's initialize this at the same place for any iterator allocated. (Yes not all types of iterator objects need this, but it's still nice to share this trivial code at one place). --- src/shared/userdb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/shared/userdb.c b/src/shared/userdb.c index 33a1442460e..91ac7c38320 100644 --- a/src/shared/userdb.c +++ b/src/shared/userdb.c @@ -114,6 +114,8 @@ static UserDBIterator* userdb_iterator_new(LookupWhat what, UserDBFlags flags) { *i = (UserDBIterator) { .what = what, .flags = flags, + .synthesize_root = !FLAGS_SET(flags, USERDB_DONT_SYNTHESIZE), + .synthesize_nobody = !FLAGS_SET(flags, USERDB_DONT_SYNTHESIZE), }; return i; @@ -730,8 +732,6 @@ int userdb_all(UserDBFlags flags, UserDBIterator **ret) { if (!iterator) return -ENOMEM; - iterator->synthesize_root = iterator->synthesize_nobody = !FLAGS_SET(flags, USERDB_DONT_SYNTHESIZE); - qr = userdb_start_query(iterator, "io.systemd.UserDatabase.GetUserRecord", true, NULL, flags); if (!FLAGS_SET(flags, USERDB_EXCLUDE_NSS) && (qr < 0 || !iterator->nss_covered)) { @@ -1002,8 +1002,6 @@ int groupdb_all(UserDBFlags flags, UserDBIterator **ret) { if (!iterator) return -ENOMEM; - iterator->synthesize_root = iterator->synthesize_nobody = !FLAGS_SET(flags, USERDB_DONT_SYNTHESIZE); - qr = userdb_start_query(iterator, "io.systemd.UserDatabase.GetGroupRecord", true, NULL, flags); if (!FLAGS_SET(flags, USERDB_EXCLUDE_NSS) && (qr < 0 || !iterator->nss_covered)) { -- 2.47.3