Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1409586 - Cannot modify CapabilityBoundingSet in drop-in file #72

Merged
merged 2 commits into from Jan 16, 2017
Merged

Bug 1409586 - Cannot modify CapabilityBoundingSet in drop-in file #72

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a28778
core: fix CapabilityBoundingSet merging
evverx Oct 27, 2015
d032009
core: fix capability bounding set parsing
evverx Oct 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/core/load-fragment.c
View file
Open in desktop
Expand Up @@ -1027,6 +1027,7 @@ int config_parse_bounding_set(const char *unit,
void *userdata) {

uint64_t *capability_bounding_set_drop = data;
uint64_t capability_bounding_set;
const char *word, *state;
size_t l;
bool invert = false;
Expand Down Expand Up @@ -1067,10 +1068,11 @@ int config_parse_bounding_set(const char *unit,
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Trailing garbage, ignoring.");

if (invert)
*capability_bounding_set_drop |= sum;
capability_bounding_set = invert ? ~sum : sum;
if (*capability_bounding_set_drop && capability_bounding_set)
*capability_bounding_set_drop = ~(~*capability_bounding_set_drop | capability_bounding_set);
else
*capability_bounding_set_drop |= ~sum;
*capability_bounding_set_drop = ~capability_bounding_set;

return 0;
}
Expand Down