containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3379 from openSUSE/rootless-fix 

Fix format specifiers in rootless_linux.c
This commit is contained in:
OpenShift Merge Robot 2019-06-21 00:18:24 -07:00 committed by GitHub
parent 39fdf91ba6 3cf3ccbd77
commit f446ccf0b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/rootless/rootless_linux.c
View File

@ -295,7 +295,7 @@ static void __attribute__((constructor)) init()
uid = geteuid (); uid = geteuid ();
gid = getegid (); gid = getegid ();
sprintf (path, "/proc/%d/ns/user", pid); sprintf (path, "/proc/%ld/ns/user", pid);
fd = open (path, O_RDONLY); fd = open (path, O_RDONLY);
if (fd < 0 || setns (fd, 0) < 0) if (fd < 0 || setns (fd, 0) < 0)
{ {
@ -305,7 +305,7 @@ static void __attribute__((constructor)) init()
close (fd); close (fd);
/* Errors here cannot be ignored as we already joined a ns. */ /* Errors here cannot be ignored as we already joined a ns. */
sprintf (path, "/proc/%d/ns/mnt", pid); sprintf (path, "/proc/%ld/ns/mnt", pid);
fd = open (path, O_RDONLY); fd = open (path, O_RDONLY);
if (fd < 0) if (fd < 0)
{ {
@ -316,7 +316,7 @@ static void __attribute__((constructor)) init()
r = setns (fd, 0); r = setns (fd, 0);
if (r < 0) if (r < 0)
{ {
fprintf (stderr, "cannot join mount namespace for %d: %s", pid, strerror (errno)); fprintf (stderr, "cannot join mount namespace for %ld: %s", pid, strerror (errno));
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
close (fd); close (fd);