From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 8 Mar 2019 11:10:16 +0000 (+0100)
Subject: nspawn: use right constant for shifting for uint64_t caps
X-Git-Tag: v242-rc1~99^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd4b15f274af5f775cda3587363177399d762a91;p=thirdparty%2Fsystemd.git

nspawn: use right constant for shifting for uint64_t caps
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 894d60c00ab..5c6d71871da 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1375,7 +1375,7 @@ static int parse_argv(int argc, char *argv[]) {
                  * --directory=". */
                 arg_directory = TAKE_PTR(arg_template);
 
-        arg_caps_retain = (arg_caps_retain | plus | (arg_private_network ? 1ULL << CAP_NET_ADMIN : 0)) & ~minus;
+        arg_caps_retain = (arg_caps_retain | plus | (arg_private_network ? UINT64_C(1) << CAP_NET_ADMIN : 0)) & ~minus;
 
         /* Make sure to parse environment before we reset the settings mask below */
         parse_environment();
@@ -3655,7 +3655,7 @@ static int merge_settings(Settings *settings, const char *path) {
 
                 plus = settings->capability;
                 if (settings_private_network(settings))
-                        plus |= (1ULL << CAP_NET_ADMIN);
+                        plus |= UINT64_C(1) << CAP_NET_ADMIN;
 
                 if (!arg_settings_trusted && plus != 0) {
                         if (settings->capability != 0)