From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 15 Nov 2023 12:56:50 +0000 (+0100)
Subject: sd-bus: don't treat invalid user/machine as a programming error
X-Git-Tag: v255-rc2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F30033%2Fhead;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index ced4466aa6f..4a0259f8bbd 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -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)