X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-dbus.c;h=598b931422d12110aaff60a2f6fb4e9b9bf9d401;hp=d1eabdbf63a350623366ebfd6b413347c00d3463;hb=a5c28308446550e0966825472babdf123fc976ac;hpb=701d4cf38514d96ea0618807ac3b08a9e52c60cd

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index d1eabdbf6..598b93142 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2464,13 +2464,9 @@ static int method_set_wall_message(
                 return 1; /* Will call us back */
 #endif // 0
 
-        if (isempty(wall_message))
-                m->wall_message = mfree(m->wall_message);
-        else {
-                r = free_and_strdup(&m->wall_message, wall_message);
-                if (r < 0)
-                        return log_oom();
-        }
+        r = free_and_strdup(&m->wall_message, empty_to_null(wall_message));
+        if (r < 0)
+                return log_oom();
 
         m->enable_wall_messages = enable_wall_messages;