summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnita Zhang <the.anitazha@gmail.com>2020-02-26 22:46:17 -0800
committerGitHub <noreply@github.com>2020-02-26 22:46:17 -0800
commit54a2f5e69c16239c515ec4c5726db72e399555c3 (patch)
treee024d5c19495f6669398d35048d7364eb0ede9d6
parentaaaf42cb44d4fcd598fca441a11856f3e8dd06d8 (diff)
parent662d74daf7c9489f08f2a05518567278a8a4945a (diff)
downloadsystemd-54a2f5e69c16239c515ec4c5726db72e399555c3.tar.gz
Merge pull request #14944 from yuwata/userdb-fix-iterator
userdb: make userdb_all() always set iterator when it returns >= 0
-rw-r--r--src/shared/userdb.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/shared/userdb.c b/src/shared/userdb.c
index 215e17db9b..1f05cda26a 100644
--- a/src/shared/userdb.c
+++ b/src/shared/userdb.c
@@ -700,12 +700,8 @@ int userdb_all(UserDBFlags flags, UserDBIterator **ret) {
setpwent();
iterator->nss_iterating = true;
goto finish;
- }
-
- if (!FLAGS_SET(flags, USERDB_DONT_SYNTHESIZE))
- goto finish;
-
- return r;
+ } else if (r < 0)
+ return r;
finish:
*ret = TAKE_PTR(iterator);