diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-10-22 23:20:59 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-10-22 23:22:47 +0200 |
| commit | affcf189153714f0de4d0986d18e2bc1b35c1b20 (patch) | |
| tree | b7e0c74332eda32a24962b206d3a7a66dd33cfb6 /src/libsystemd | |
| parent | 505e77caa5cafce27b0dbfcf23e9b28315d167ae (diff) | |
machine: validate machine names using machine_name_is_valid() instead of string_is_safe()
After all, we know have this as generic validator, so let's be correct
and use it wherver applicable.
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index f3796175cc..e677a88bac 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -767,7 +767,7 @@ static int parse_container_unix_address(sd_bus *b, const char **p, char **guid) if (!machine) return -EINVAL; - if (!filename_is_safe(machine)) + if (!machine_name_is_valid(machine)) return -EINVAL; free(b->machine); @@ -809,7 +809,7 @@ static int parse_container_kernel_address(sd_bus *b, const char **p, char **guid if (!machine) return -EINVAL; - if (!filename_is_safe(machine)) + if (!machine_name_is_valid(machine)) return -EINVAL; free(b->machine); @@ -1309,7 +1309,7 @@ _public_ int sd_bus_open_system_container(sd_bus **ret, const char *machine) { assert_return(machine, -EINVAL); assert_return(ret, -EINVAL); - assert_return(filename_is_safe(machine), -EINVAL); + assert_return(machine_name_is_valid(machine), -EINVAL); r = sd_bus_new(&bus); if (r < 0) |