From b068c6f587076fdb870b0f1ac2e10e36f1987520 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 24 Nov 2017 17:01:32 +0100 Subject: [PATCH] systemctl: ignore shutdown's "-t" argument (#7459) We should not only ignore "-t" itself, but also whatever is passed to it. This pretty much reverts the core of a4420f7b8ed73b05ef6f31622101e7804daef69f, and adds back in the status quo ante. What a difference a ':' can make. This also adds a quick comment for this, so that we don't make this mistake again. Fixes: #7413 --- src/systemctl/systemctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index ae11bf1ded2..4fd9b106340 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -8084,7 +8084,7 @@ static int shutdown_parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "HPrhkKtafFc", options, NULL)) >= 0) + while ((c = getopt_long(argc, argv, "HPrhkKat:fFc", options, NULL)) >= 0) switch (c) { case ARG_HELP: @@ -8123,8 +8123,8 @@ static int shutdown_parse_argv(int argc, char *argv[]) { arg_no_wall = true; break; - case 't': case 'a': + case 't': /* Note that we also ignore any passed argument to -t, not just the -t itself */ case 'f': case 'F': /* Compatibility nops */