Merge pull request #3468 from giuseppe/fix-sudo-rootless

rootless: do not join namespace if it has already euid == 0
containers · Jul 1, 2019 · 3b9ce8a · 3b9ce8a
2 parents 1507788 + 4b176d4
commit 3b9ce8a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
@@ -244,7 +244,7 @@ static void __attribute__((constructor)) init()
   /* Shortcut.  If we are able to join the pause pid file, do it now so we don't
      need to re-exec.  */
   xdg_runtime_dir = getenv ("XDG_RUNTIME_DIR");
-  if (xdg_runtime_dir && xdg_runtime_dir[0] && can_use_shortcut ())
+  if (geteuid () != 0 && xdg_runtime_dir && xdg_runtime_dir[0] && can_use_shortcut ())
     {
       int r;
       int fd;