Merge pull request #14944 from yuwata/userdb-fix-iterator

userdb: make userdb_all() always set iterator when it returns >= 0
2020-02-26 22:46:17 -08:00 · 2020-02-26 22:46:17 -08:00 · 54a2f5e69c
parent aaaf42cb44 662d74daf7
commit 54a2f5e69c
1 changed files with 2 additions and 6 deletions
--- a/src/shared/userdb.c
+++ b/src/shared/userdb.c
@ -700,11 +700,7 @@ int userdb_all(UserDBFlags flags, UserDBIterator **ret) {
                setpwent();
                iterator->nss_iterating = true;
                goto finish;
-        }
-
-        if (!FLAGS_SET(flags, USERDB_DONT_SYNTHESIZE))
-                goto finish;
-
+        } else if (r < 0)
                return r;

 finish: