Skip to content

Commit 6565b9d

Browse files
committed
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.
1 parent 6e07f60 commit 6565b9d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/libsystemd/sd-bus/sd-bus.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1698,8 +1698,8 @@ _public_ int sd_bus_open_system_machine(sd_bus **ret, const char *user_and_machi
16981698
r = user_and_machine_valid(user_and_machine);
16991699
if (r < 0)
17001700
return r;
1701-
1702-
assert_return(r > 0, -EINVAL);
1701+
if (r == 0)
1702+
return -EINVAL;
17031703

17041704
r = sd_bus_new(&b);
17051705
if (r < 0)
@@ -1734,8 +1734,8 @@ _public_ int sd_bus_open_user_machine(sd_bus **ret, const char *user_and_machine
17341734
r = user_and_machine_valid(user_and_machine);
17351735
if (r < 0)
17361736
return r;
1737-
1738-
assert_return(r > 0, -EINVAL);
1737+
if (r == 0)
1738+
return -EINVAL;
17391739

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

0 commit comments

Comments
 (0)