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

Merge pull request #6985 from yuwata/empty

Browse Source 
load-fragment: do not create empty array
This commit is contained in:
Lennart Poettering
2017-10-04 17:54:35 +02:00
committed by GitHub
parent 4c70109600 ac6e8be66e
commit 5ad90fe376
2 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/execute.c
+3 -3
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);