picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

logind: treat an empty wall message like a NULL one

Browse source
This commit is contained in:
Lennart Poettering 2015-09-04 10:34:47 +02:00
parent c7f837628b
commit 5744f59a3e
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/login/logind-dbus.c
View file

@ -1339,8 +1339,7 @@ static int bus_manager_log_shutdown(
InhibitWhat w,
const char *unit_name) {
const char *p;
const char *q;
const char *p, *q;
assert(m);
assert(unit_name);
@ -1365,8 +1364,8 @@ static int bus_manager_log_shutdown(
q = NULL;
}
if (m->wall_message)
p = strjoina(p, " (", m->wall_message, ")", NULL);
if (!isempty(m->wall_message))
p = strjoina(p, " (", m->wall_message, ")");
return log_struct(LOG_NOTICE,
LOG_MESSAGE_ID(SD_MESSAGE_SHUTDOWN),
@ -2310,15 +2309,19 @@ static int method_set_wall_message(
UID_INVALID,
&m->polkit_registry,
error);
if (r < 0)
return r;
if (r == 0)
return 1; /* Will call us back */
r = free_and_strdup(&m->wall_message, wall_message);
if (r < 0)
return log_oom();
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();
}
m->enable_wall_messages = enable_wall_messages;
return sd_bus_reply_method_return(message, NULL);