From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Tue, 27 Oct 2015 11:40:28 +0000 (+0300)
Subject: core: fix CapabilityBoundingSet merging
X-Git-Tag: v228~139^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9d345b53ff0ee402c9dceee1bc14bf0d8907706;p=thirdparty%2Fsystemd.git

core: fix CapabilityBoundingSet merging

Fixes: #1221
---

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 31fdc48823e..6fa506bd6c8 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;
 }