From e7bcff4ec4eeb1f04e2f35cecea4e50698dddb00 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 15 Dec 2017 21:25:00 +0900 Subject: [PATCH] core: move path_kill_slashes() to manager --- src/core/dbus-execute.c | 4 +++- src/shared/bus-unit-util.c | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 35407d19eb1..e4a31e1d3e7 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -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)) { diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index 372e431d63f..092c1768c76 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -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); -- 2.47.3