summaryrefslogtreecommitdiff
path: root/src/mount
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2017-11-19 19:49:11 +0100
committerGitHub <noreply@github.com>2017-11-19 19:49:11 +0100
commit0133d5553a1b24185f251ebbc4d873606118780f (patch)
treea226c702e98793585741d7c0183c631e419ec12a /src/mount
parent0b252fc0bea31141c0073f7cd20b825d2f69284d (diff)
parent370f9c21b9560883ccbbf1cea4c94c9a6b81d8bd (diff)
downloadsystemd-0133d5553a1b24185f251ebbc4d873606118780f.tar.gz
Merge pull request #7198 from poettering/stdin-stdout
Add StandardInput=data, StandardInput=file:... and more
Diffstat (limited to 'src/mount')
-rw-r--r--src/mount/mount-tool.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index ce0df21fd6..dd5f62e824 100644
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -887,8 +887,8 @@ static int stop_mounts(
return -EINVAL;
}
- if (!path_is_safe(where)) {
- log_error("Path contains unsafe components: %s", where);
+ if (!path_is_normalized(where)) {
+ log_error("Path contains non-normalized components: %s", where);
return -EINVAL;
}
@@ -1569,8 +1569,8 @@ int main(int argc, char* argv[]) {
goto finish;
}
- if (!path_is_safe(arg_mount_what)) {
- log_error("Path contains unsafe components: %s", arg_mount_what);
+ if (!path_is_normalized(arg_mount_what)) {
+ log_error("Path contains non-normalized components: %s", arg_mount_what);
r = -EINVAL;
goto finish;
}
@@ -1593,8 +1593,8 @@ int main(int argc, char* argv[]) {
goto finish;
}
- if (!path_is_safe(arg_mount_where)) {
- log_error("Path contains unsafe components: %s", arg_mount_where);
+ if (!path_is_normalized(arg_mount_where)) {
+ log_error("Path contains non-normalized components: %s", arg_mount_where);
r = -EINVAL;
goto finish;
}