Merge pull request #14953 from yuwata/userdb-fix-groupdb

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

1 files changed, 2 insertions, 10 deletions

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