SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9917 from keszybz/cleanups

Browse Source 
Some unrelated fixups for recent PRs
This commit is contained in:
Yu Watanabe
2018-08-24 10:43:41 +09:00
committed by GitHub
parent f16eb8b083 e3bb989b6f
commit 593a5213ce
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-socket-util.c
+9 -6
View File
@@ -434,7 +434,6 @@ static void test_getpeercred_getpeergroups(void) {
if (r == 0) {
static const gid_t gids[] = { 3, 4, 5, 6, 7 };
gid_t *test_gids;
_cleanup_free_ gid_t *peer_groups = NULL;
size_t n_test_gids;
uid_t test_uid;
gid_t test_gid;
@@ -475,12 +474,16 @@ static void test_getpeercred_getpeergroups(void) {
assert_se(ucred.gid == test_gid);
assert_se(ucred.pid == getpid_cached());
r = getpeergroups(pair[0], &peer_groups);
assert_se(r >= 0 || IN_SET(r, -EOPNOTSUPP, -ENOPROTOOPT));
{
_cleanup_free_ gid_t *peer_groups = NULL;
if (r >= 0) {
assert_se((size_t) r == n_test_gids);
assert_se(memcmp(peer_groups, test_gids, sizeof(gid_t) * n_test_gids) == 0);
r = getpeergroups(pair[0], &peer_groups);
assert_se(r >= 0 || IN_SET(r, -EOPNOTSUPP, -ENOPROTOOPT));
if (r >= 0) {
assert_se((size_t) r == n_test_gids);
assert_se(memcmp(peer_groups, test_gids, sizeof(gid_t) * n_test_gids) == 0);
}
}
safe_close_pair(pair);