shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-25 18:50:18 +03:00
Code

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
commit 5ad90fe376
2 changed files with 5 additions and 25 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);

24
src/core/load-fragment.c
View File

@ -284,19 +284,7 @@ int config_parse_unit_path_strv_printf(
assert(u);
if (isempty(rvalue)) {
char **empty;
/* Empty assignment resets the list. As a special rule
* we actually fill in a real empty array here rather
* than NULL, since some code wants to know if
* something was set at all... */
empty = new0(char*, 1);
if (!empty)
return log_oom();
strv_free(*x);
*x = empty;
*x = strv_free(*x);
return 0;
}
@ -1968,15 +1956,7 @@ int config_parse_user_group_strv(
assert(u);
if (isempty(rvalue)) {
char **empty;
empty = new0(char*, 1);
if (!empty)
return log_oom();
strv_free(*users);
*users = empty;
*users = strv_free(*users);
return 0;
}