]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
nspawn: use right constant for shifting for uint64_t caps
authorLennart Poettering <lennart@poettering.net>
Fri, 8 Mar 2019 11:10:16 +0000 (12:10 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 15 Mar 2019 14:42:20 +0000 (15:42 +0100)
src/nspawn/nspawn.c

index 894d60c00abc2d5822fe006d1ccacb77711e8566..5c6d71871da43a868b708b360b6e3d90d8440c46 100644 (file)
@@ -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)