]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
userdb: make userdb_all() always set iterator when it returns >= 0 14944/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 26 Feb 2020 13:26:23 +0000 (22:26 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 26 Feb 2020 14:57:13 +0000 (23:57 +0900)
Fixes #14868.

src/shared/userdb.c

index 215e17db9b6b55de4da507568d011ca505b3c22d..1f05cda26ad4ab3943ea67f2dac1463c3f8d1de0 100644 (file)
@@ -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);