picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: use strv_isempty to check if supplementary_groups is empty 

With the previous commit, we know that it will be NULL if empty, but
it's safe to always use strv_isempty() in case the code changes
in the future.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-10-04 11:33:30 +02:00
parent 9f2d41a65f
commit ac6e8be66e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/execute.c
View File

@ -895,7 +895,7 @@ static int get_supplementary_groups(const ExecContext *c, const char *user,
keep_groups = true;
}
if (!c->supplementary_groups)
if (strv_isempty(c->supplementary_groups))
return 0;
/*
@ -969,7 +969,7 @@ static int enforce_groups(const ExecContext *context, gid_t gid,
assert(context);
/* Handle SupplementaryGroups= even if it is empty */
if (context->supplementary_groups) {
if (!strv_isempty(context->supplementary_groups)) {
r = maybe_setgroups(ngids, supplementary_gids);
if (r < 0)
return r;
@ -4052,7 +4052,7 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
fprintf(f, "%sDynamicUser: %s\n", prefix, yes_no(c->dynamic_user));
if (strv_length(c->supplementary_groups) > 0) {
if (!strv_isempty(c->supplementary_groups)) {
fprintf(f, "%sSupplementaryGroups:", prefix);
strv_fprintf(f, c->supplementary_groups);
fputs("\n", f);