]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
userdb: make groupdb_all() always set iterator when it returns >= 0 14953/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 27 Feb 2020 09:05:14 +0000 (18:05 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 27 Feb 2020 09:05:14 +0000 (18:05 +0900)
src/shared/userdb.c

index be9af7e8aeae09e97e3d3ab28f694f16df909d4f..63599e7141ed3b5f31317a2d48530fc1fab0180a 100644 (file)
@@ -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;
 }