Merge pull request #14944 from yuwata/userdb-fix-iterator

userdb: make userdb_all() always set iterator when it returns >= 0
This commit is contained in:
Anita Zhang 2020-02-26 22:46:17 -08:00 committed by GitHub
commit 54a2f5e69c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions

View 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);