morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
userdb: make groupdb_all() always set iterator when it returns >= 0
This commit is contained in:
Yu Watanabe
2020-02-27 19:53:20 +09:00
committed by GitHub
parent e9b0b64f77 443876d8dc
commit 15db1f3d2e
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/shared/userdb.c
View File

@@ -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;
}