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

Merge pull request #1695 from evverx/fix-cap-bounding-merging

Browse source 
core: fix CapabilityBoundingSet merging
This commit is contained in:
Lennart Poettering 2015-10-27 17:09:05 +01:00
parent 0d06968129 b9d345b53f
commit 64529a2921
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/load-fragment.c
View file

@ -982,6 +982,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;
@ -1021,10 +1022,11 @@ int config_parse_bounding_set(const char *unit,
if (!isempty(state))
log_syntax(unit, LOG_ERR, filename, line, 0, "Trailing garbage, ignoring.");
if (invert)
*capability_bounding_set_drop |= sum;
capability_bounding_set = invert ? ~sum : sum;
if (*capability_bounding_set_drop)
*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;
}