machine: validate machine names using machine_name_is_valid() instead of string_is_safe()

[elogind.git] / src / libsystemd / sd-bus / sd-bus.c

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index f3796175cc49ceb1b03d89cd93543b9d0c756ded..e677a88bac2919b6e93f029b6e7187a3b010c172 100644 (file)
--- 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 (!machine)
                 return -EINVAL;
 

-        if (!filename_is_safe(machine))
+        if (!machine_name_is_valid(machine))

                 return -EINVAL;
 
         free(b->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 (!machine)
                 return -EINVAL;
 

-        if (!filename_is_safe(machine))
+        if (!machine_name_is_valid(machine))

                 return -EINVAL;
 
         free(b->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(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)
 
         r = sd_bus_new(&bus);
         if (r < 0)