From b9d345b53ff0ee402c9dceee1bc14bf0d8907706 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Tue, 27 Oct 2015 14:40:28 +0300 Subject: core: fix CapabilityBoundingSet merging Fixes: #1221 --- src/core/load-fragment.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/core/load-fragment.c') diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 31fdc48823..6fa506bd6c 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -976,6 +976,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; @@ -1015,10 +1016,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; } -- cgit v1.2.3-54-g00ecf