From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Wed, 23 Mar 2016 07:46:58 +0000 (+0100)
Subject: logind: fix crash when shutdown is not issued from a tty
X-Git-Tag: v230~237^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2887%2Fhead;p=thirdparty%2Fsystemd.git

logind: fix crash when shutdown is not issued from a tty

It's possible that sd_bus_creds_get_tty() fails and thus
scheduled_shutdown_tty is NULL in method_schedule_shutdown().

Fix logind_wall_tty_filter() to get along with that, by showing the message on
all TTYs, instead of crashing in strcmp().

https://launchpad.net/bugs/1553040
---

diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c
index 11a91c3947c..29ab00eb1f7 100644
--- a/src/login/logind-utmp.c
+++ b/src/login/logind-utmp.c
@@ -65,7 +65,7 @@ bool logind_wall_tty_filter(const char *tty, void *userdata) {
 
         assert(m);
 
-        if (!startswith(tty, "/dev/"))
+        if (!startswith(tty, "/dev/") || !m->scheduled_shutdown_tty)
                 return true;
 
         return !streq(tty + 5, m->scheduled_shutdown_tty);