shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

Merge pull request #1141 from poettering/logind-fixes

Browse Source 
Various logind fixes
This commit is contained in:
Daniel Mack 2015-09-04 12:13:45 +02:00
commit f6bd4cb69e
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
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),
@ -2294,7 +2293,7 @@ static int method_set_wall_message(
int r;
Manager *m = userdata;
char *wall_message;
bool enable_wall_messages;
int enable_wall_messages;
assert(message);
assert(m);
@ -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);