From: myrkr <torsten.hilbrich@gmx.net>
Date: Tue, 24 Oct 2017 07:56:40 +0000 (+0200)
Subject: nspawn: Fix calculation of capabilities for configuration file (#7087)
X-Git-Tag: v236~301
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1898e5f9a37d1a50f8c0bd1147abe11c3d38a16b;p=thirdparty%2Fsystemd.git

nspawn: Fix calculation of capabilities for configuration file (#7087)

The current code shifting an integer 1 failed for capabilities like
CAP_MAC_ADMIN (numerical value 33). This caused issues when specifying
them in the nspawn configuration file. Using an uint64_t 1 instead.

The similar code for processing the --capability command line option
was already correctly working.
---

diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
index c02c1ea697d..285e22820f0 100644
--- a/src/nspawn/nspawn-settings.c
+++ b/src/nspawn/nspawn-settings.c
@@ -202,7 +202,7 @@ int config_parse_capability(
                         continue;
                 }
 
-                u |= 1 << ((uint64_t) cap);
+                u |= UINT64_C(1) << cap;
         }
 
         if (u == 0)