Skip to content

L
lxc
Unverified Commit e0419ca1 by Tycho Andersen Committed by Christian Brauner
Options

fix up lxc-usernsexec's exit status

* exit(1) when there is an option parsing error * exit(0) when the user explicitly asks for help * exit(1) when the user specifies an invalid option Signed-off-by: 's avatarTycho Andersen <tycho@tycho.ws>
parent 3380e58a
Showing with 9 additions and 2 deletions
src/lxc/tools/lxc_usernsexec.c
...@@ -71,7 +71,6 @@ static void usage(const char *name) ...@@ -71,7 +71,6 @@ static void usage(const char *name)
printf(" Note: This program uses newuidmap(2) and newgidmap(2).\n"); printf(" Note: This program uses newuidmap(2) and newgidmap(2).\n");
printf(" As such, /etc/subuid and /etc/subgid must grant the\n"); printf(" As such, /etc/subuid and /etc/subgid must grant the\n");
printf(" calling user permission to use the mapped ranges\n"); printf(" calling user permission to use the mapped ranges\n");
exit(EXIT_SUCCESS);
} }
static void opentty(const char * tty, int which) { static void opentty(const char * tty, int which) {
...@@ -300,10 +299,18 @@ int main(int argc, char *argv[]) ...@@ -300,10 +299,18 @@ int main(int argc, char *argv[])
while ((c = getopt(argc, argv, "m:h")) != EOF) { while ((c = getopt(argc, argv, "m:h")) != EOF) {
switch (c) { switch (c) {
case 'm': if (parse_map(optarg)) usage(argv[0]); break; case 'm':
if (parse_map(optarg)) {
usage(argv[0]);
exit(EXIT_FAILURE);
}
break;
case 'h': case 'h':
usage(argv[0]);
exit(EXIT_SUCCESS);
default: default:
usage(argv[0]); usage(argv[0]);
exit(EXIT_FAILURE);
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment