From 3c6f7c340237262b560586cf7cf06be957d4352f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 30 May 2016 17:59:43 +0200
Subject: util-lib: make localed's nonempty() generic, rename it to
 empty_to_null() and make use of it everywhere

---
 src/machine/machine-dbus.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/machine/machine-dbus.c')

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))
-- 
cgit v1.2.3-54-g00ecf