From e4a9373fb3ddeadd6b847449186fadf5963695f7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 18 Jun 2010 20:23:17 +0200 Subject: [PATCH] systemctl: when called as shutdown, properly handle user specified wall message --- src/systemctl.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/systemctl.c b/src/systemctl.c index 447a2445..68e4a909 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -39,6 +39,7 @@ #include "utmp-wtmp.h" #include "special.h" #include "initreq.h" +#include "strv.h" static const char *arg_type = NULL; static bool arg_all = false; @@ -139,6 +140,23 @@ static void warn_wall(enum action action) { if (arg_no_wall) return; + if (arg_wall) { + char *p; + + if (!(p = strv_join(arg_wall, " "))) { + log_error("Failed to join strings."); + return; + } + + if (*p) { + utmp_wall(p); + free(p); + return; + } + + free(p); + } + if (!table[action]) return; -- 2.39.5