From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Apr 2015 14:21:38 +0000 (+0200)
Subject: core: fix parsing of mount flags
X-Git-Tag: v220~326
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d9803b83c1f72e1bf158af4615b1c53a4749118;p=thirdparty%2Fsystemd.git

core: fix parsing of mount flags

As reported my Maciej Wereski:

http://lists.freedesktop.org/archives/systemd-devel/2015-February/028320.html
---

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index eada71e227d..b76656b9311 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1202,17 +1202,15 @@ int config_parse_exec_mount_flags(const char *unit,
                         flags = MS_SHARED;
                 else if (streq(t, "slave"))
                         flags = MS_SLAVE;
-                else if (streq(word, "private"))
+                else if (streq(t, "private"))
                         flags = MS_PRIVATE;
                 else {
-                        log_syntax(unit, LOG_ERR, filename, line, EINVAL,
-                                   "Failed to parse mount flag %s, ignoring: %s", t, rvalue);
+                        log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Failed to parse mount flag %s, ignoring: %s", t, rvalue);
                         return 0;
                 }
         }
         if (!isempty(state))
-                log_syntax(unit, LOG_ERR, filename, line, EINVAL,
-                           "Trailing garbage, ignoring.");
+                log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Trailing garbage, ignoring.");
 
         c->mount_flags = flags;
         return 0;