]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
basic/path-util: fix ordering in error message
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 11 Jun 2018 12:37:36 +0000 (14:37 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 11 Jun 2018 15:06:23 +0000 (17:06 +0200)
Jun 11 14:29:12 krowka systemd[1]: /etc/systemd/system/workingdir.service:6: = path is not normalizedWorkingDirectory: /../../etc
   ↓
Jun 11 14:32:12 krowka systemd[1]: /etc/systemd/system/workingdir.service:6: WorkingDirectory= path is not normalized: /../../etc

src/basic/path-util.c

index 547b38e2a9f56599680ae6397c7f608e74d4de10..f36301ccf5ae3c719f5dd6dfc03c01d47c8c929f 100644 (file)
@@ -1014,14 +1014,14 @@ int path_simplify_and_warn(
                 if (!absolute && (flag & PATH_CHECK_ABSOLUTE)) {
                         log_syntax(unit, LOG_ERR, filename, line, 0,
                                    "%s= path is not absolute%s: %s",
-                                   fatal ? "" : ", ignoring", lvalue, path);
+                                   lvalue, fatal ? "" : ", ignoring", path);
                         return -EINVAL;
                 }
 
                 if (absolute && (flag & PATH_CHECK_RELATIVE)) {
                         log_syntax(unit, LOG_ERR, filename, line, 0,
                                    "%s= path is absolute%s: %s",
-                                   fatal ? "" : ", ignoring", lvalue, path);
+                                   lvalue, fatal ? "" : ", ignoring", path);
                         return -EINVAL;
                 }
         }
@@ -1031,7 +1031,7 @@ int path_simplify_and_warn(
         if (!path_is_normalized(path)) {
                 log_syntax(unit, LOG_ERR, filename, line, 0,
                            "%s= path is not normalized%s: %s",
-                           fatal ? "" : ", ignoring", lvalue, path);
+                           lvalue, fatal ? "" : ", ignoring", path);
                 return -EINVAL;
         }