From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 26 Feb 2020 13:26:23 +0000 (+0900)
Subject: userdb: make userdb_all() always set iterator when it returns >= 0
X-Git-Tag: v245-rc2~45^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F14944%2Fhead;p=thirdparty%2Fsystemd.git

userdb: make userdb_all() always set iterator when it returns >= 0

Fixes #14868.
---

diff --git a/src/shared/userdb.c b/src/shared/userdb.c
index 215e17db9b6..1f05cda26ad 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);