From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 27 Feb 2020 09:05:14 +0000 (+0900)
Subject: userdb: make groupdb_all() always set iterator when it returns >= 0
X-Git-Tag: v245-rc2~38^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=443876d8dcf3a8cf9abbb04a23a288bf9fc3b7f0;p=thirdparty%2Fsystemd.git

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

diff --git a/src/shared/userdb.c b/src/shared/userdb.c
index be9af7e8aea..63599e7141e 100644
--- a/src/shared/userdb.c
+++ b/src/shared/userdb.c
@@ -903,15 +903,9 @@ int groupdb_all(UserDBFlags flags, UserDBIterator **ret) {
 
                 setgrent();
                 iterator->nss_iterating = true;
-                goto finish;
-        }
-
-        if (!FLAGS_SET(flags, USERDB_DONT_SYNTHESIZE))
-                goto finish;
+        } if (r < 0)
+                  return r;
 
-        return r;
-
-finish:
         *ret = TAKE_PTR(iterator);
         return 0;
 }