diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-06-04 18:47:56 -0400 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-06-04 18:47:56 -0400 |
commit | 20f8477be541f2486737f1be32bdb0bd0d6372fd (patch) | |
tree | b99412abf9bf45fddc04ef330f5546059d3a444d /src/machine | |
parent | 3fb1ac5d57954bb0d881a68777e996b46ed44ce3 (diff) | |
parent | ac83514cbf5997938344d5fbcfcbfd5021f453f9 (diff) |
Merge pull request #3392 from poettering/assorted-stuff
Assorted stuff
Diffstat (limited to 'src/machine')
-rw-r--r-- | src/machine/machine-dbus.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 7b9aa66d63..de5d98f23e 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -655,8 +655,7 @@ int bus_machine_method_open_shell(sd_bus_message *message, void *userdata, sd_bu r = sd_bus_message_read(message, "ss", &user, &path); if (r < 0) return r; - if (isempty(user)) - user = NULL; + user = empty_to_null(user); if (isempty(path)) path = "/bin/sh"; if (!path_is_absolute(path)) |