From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 16 Mar 2011 02:35:59 +0000 (+0100)
Subject: main: interpret all argv[] arguments unconditionally when run in a container
X-Git-Tag: v21~66
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d821e6d69a84e0fafde0228f9b8f8837216eafa7;p=systemd

main: interpret all argv[] arguments unconditionally when run in a container
---

diff --git a/src/main.c b/src/main.c
index 5b75ecca..1d6ac42e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -828,30 +828,28 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
                 }
 
-        if (optind < argc) {
-                if (getpid() != 1) {
-                        /* Hmm, when we aren't run as init system
-                         * let's complain about excess arguments */
-
-                        log_error("Excess arguments.");
-                        return -EINVAL;
-
-                } else if (detect_container(NULL) > 0) {
-                        char **a;
-
-                        /* All /proc/cmdline arguments the kernel
-                         * didn't understand it passed to us. We're
-                         * note really interested in that usually
-                         * since /proc/cmdline is more interesting and
-                         * complete. With one exception: if we are run
-                         * in a container /proc/cmdline is not
-                         * relevant for us, hence we rely on argv[]
-                         * instead. */
-
-                        for (a = argv; a < argv + argc; a++)
-                                if ((r = parse_proc_cmdline_word(*a)) < 0)
-                                        return r;
-                }
+        if (optind < argc && getpid() != 1) {
+                /* Hmm, when we aren't run as init system
+                 * let's complain about excess arguments */
+
+                log_error("Excess arguments.");
+                return -EINVAL;
+        }
+
+        if (detect_container(NULL) > 0) {
+                char **a;
+
+                /* All /proc/cmdline arguments the kernel didn't
+                 * understand it passed to us. We're not really
+                 * interested in that usually since /proc/cmdline is
+                 * more interesting and complete. With one exception:
+                 * if we are run in a container /proc/cmdline is not
+                 * relevant for the container, hence we rely on argv[]
+                 * instead. */
+
+                for (a = argv; a < argv + argc; a++)
+                        if ((r = parse_proc_cmdline_word(*a)) < 0)
+                                return r;
         }
 
         return 0;