From: Luca Boccassi <luca.boccassi@microsoft.com>
Date: Tue, 15 Dec 2020 18:26:34 +0000 (+0000)
Subject: machine: adjust error message to use 'normalized' instead of ../
X-Git-Tag: archive/raspbian/247.3-7+rpi1+deb11u1^2~32
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=28f29b9e88ce105381f238b115023beb6680b0e3;p=systemd.git

machine: adjust error message to use 'normalized' instead of ../

(cherry picked from commit 724e689715c8d9f23d035ab20d8c87b6b6c06e33)

Gbp-Pq: Name machine-adjust-error-message-to-use-normalized-instead-of.patch
---

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 3c8f4fdd..5ed892f6 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -827,12 +827,12 @@ int bus_machine_method_bind_mount(sd_bus_message *message, void *userdata, sd_bu
                 return r;
 
         if (!path_is_absolute(src) || !path_is_normalized(src))
-                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Source path must be absolute and not contain ../.");
+                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Source path must be absolute and normalized.");
 
         if (isempty(dest))
                 dest = src;
         else if (!path_is_absolute(dest) || !path_is_normalized(dest))
-                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Destination path must be absolute and not contain ../.");
+                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Destination path must be absolute and normalized.");
 
         r = bus_verify_polkit_async(
                         message,