]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: move path_kill_slashes() to manager
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 15 Dec 2017 12:25:00 +0000 (21:25 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 19 Dec 2017 01:44:20 +0000 (10:44 +0900)
src/core/dbus-execute.c
src/shared/bus-unit-util.c

index 35407d19eb16729820f5b0c0d8695490cb9d6d69..e4a31e1d3e7de868b7026339390411025ca3921d 100644 (file)
@@ -2323,7 +2323,7 @@ int bus_exec_context_set_transient_property(
                         return r;
 
                 STRV_FOREACH(p, l) {
-                        const char *i = *p;
+                        char *i = *p;
                         size_t offset;
 
                         if (!utf8_is_valid(i))
@@ -2333,6 +2333,8 @@ int bus_exec_context_set_transient_property(
                         offset += i[offset] == '+';
                         if (!path_is_absolute(i + offset))
                                 return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid %s", name);
+
+                        path_kill_slashes(i + offset);
                 }
 
                 if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
index 372e431d63f193d2079088bf0baffdb49a80482d..092c1768c7696732a5255edf29ddf7182581f58b 100644 (file)
@@ -1008,8 +1008,6 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
                                 return -EINVAL;
                         }
 
-                        path_kill_slashes(word + offset);
-
                         r = sd_bus_message_append_basic(m, 's', word);
                         if (r < 0)
                                 return bus_log_create_error(r);