proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 12:45:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

replace fprintf by ERROR call in lxc_unshare.c

Browse Source 
Do it except for the usage functions that will be removed by another patch

This is a follow on a previous patch that treated
all src/lxc/lxc_*.c but this file.

Signed-off-by: Michel Normand <normand@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Michel Normand 2009-05-14 15:11:40 +02:00 committed by Daniel Lezcano
parent 1615dc39e2
commit d00184d361
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lxc/lxc_unshare.c
View File

@ -34,6 +34,8 @@
#include <lxc/lxc.h> #include <lxc/lxc.h>
lxc_log_define(lxc_unshare, lxc);
void usage(char *cmd) void usage(char *cmd)
{ {
fprintf(stderr, "%s <options> [command]\n", basename(cmd)); fprintf(stderr, "%s <options> [command]\n", basename(cmd));
@ -67,13 +69,13 @@ static uid_t lookup_user(const char *optarg)
return uid; return uid;
if (getpwnam_r(name, &pwent, buff, bufflen, &pent) || !pent) { if (getpwnam_r(name, &pwent, buff, bufflen, &pent) || !pent) {
fprintf(stderr, "invalid username %s\n", name); ERROR("invalid username %s", name);
return uid; return uid;
} }
uid = pent->pw_uid; uid = pent->pw_uid;
} else { } else {
if (getpwuid_r(uid, &pwent, buff, bufflen, &pent) || !pent) { if (getpwuid_r(uid, &pwent, buff, bufflen, &pent) || !pent) {
fprintf(stderr, "invalid uid %d\n", uid); ERROR("invalid uid %d", uid);
uid = -1; uid = -1;
return uid; return uid;
} }
@ -131,45 +133,45 @@ int main(int argc, char *argv[])
pid = fork_ns(flags); pid = fork_ns(flags);
if (pid < 0) { if (pid < 0) {
fprintf(stderr, "failed to fork into a new namespace: %s\n", ERROR("failed to fork into a new namespace: %s",
strerror(errno)); strerror(errno));
return 1; return 1;
} }
if (!pid) { if (!pid) {
if (flags & CLONE_NEWUSER && setuid(uid)) { if (flags & CLONE_NEWUSER && setuid(uid)) {
fprintf(stderr, "failed to set uid %d: %s\n", ERROR("failed to set uid %d: %s",
uid, strerror(errno)); uid, strerror(errno));
exit(1); exit(1);
} }
execvp(args[0], args); execvp(args[0], args);
fprintf(stderr, "failed to exec: '%s': %s\n", ERROR("failed to exec: '%s': %s",
argv[0], strerror(errno)); argv[0], strerror(errno));
exit(1); exit(1);
} }
if (waitpid(pid, &status, 0) < 0) if (waitpid(pid, &status, 0) < 0)
fprintf(stderr, "failed to wait for '%d'\n", pid); ERROR("failed to wait for '%d'", pid);
return status; return status;
} }
if (unshare_ns(flags)) { if (unshare_ns(flags)) {
fprintf(stderr, "failed to unshare the current process: %s\n", ERROR("failed to unshare the current process: %s",
strerror(errno)); strerror(errno));
return 1; return 1;
} }
if (flags & CLONE_NEWUSER && setuid(uid)) { if (flags & CLONE_NEWUSER && setuid(uid)) {
fprintf(stderr, "failed to set uid %d: %s\n", ERROR("failed to set uid %d: %s",
uid, strerror(errno)); uid, strerror(errno));
return 1; return 1;
} }
if (argv[optind] && strlen(argv[optind])) { if (argv[optind] && strlen(argv[optind])) {
execvp(args[0], args); execvp(args[0], args);
fprintf(stderr, "failed to exec: '%s': %s\n", ERROR("failed to exec: '%s': %s",
argv[0], strerror(errno)); argv[0], strerror(errno));
return 1; return 1;
} }