From 443876d8dcf3a8cf9abbb04a23a288bf9fc3b7f0 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 27 Feb 2020 18:05:14 +0900 Subject: userdb: make groupdb_all() always set iterator when it returns >= 0 --- src/shared/userdb.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/shared/userdb.c b/src/shared/userdb.c index be9af7e8ae..63599e7141 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; } -- cgit v1.2.1