sd-bus: don't treat invalid user/machine as a programming error

$ SYSTEMD_LOG_LEVEL=debug machinectl status --machine=@ Assertion 'r > 0' failed at src/libsystemd/sd-bus/sd-bus.c:1694, function sd_bus_open_system_machine(). Ignoring.
2023-11-15 13:56:50 +01:00
parent 6e07f600ba
commit 6565b9d0b1
1 changed files with 4 additions and 4 deletions
@@ -1698,8 +1698,8 @@ _public_ int sd_bus_open_system_machine(sd_bus **ret, const char *user_and_machi
        r = user_and_machine_valid(user_and_machine);
        if (r < 0)
                return r;
-
-        assert_return(r > 0, -EINVAL);
+        if (r == 0)
+                return -EINVAL;

        r = sd_bus_new(&b);
        if (r < 0)
@@ -1734,8 +1734,8 @@ _public_ int sd_bus_open_user_machine(sd_bus **ret, const char *user_and_machine
        r = user_and_machine_valid(user_and_machine);
        if (r < 0)
                return r;
-
-        assert_return(r > 0, -EINVAL);
+        if (r == 0)
+                return -EINVAL;

        r = sd_bus_new(&b);
        if (r < 0)