summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
authorMartin Pitt <martinpitt@gnome.org>2013-03-26 11:36:31 +0100
committerMartin Pitt <martinpitt@gnome.org>2013-04-05 18:16:58 +0200
commit79d860fe78ff9e53fe3150fb55a8a8b03c4f6470 (patch)
tree1905740de9ce74a2006ee23dda5549c0efd81a34 /src/udev
parent9e542e0b3a5069f340072c93b5d2283848a42a2e (diff)
PAM, uaccess: check for logind, not for systemd
It is possible to build systemd without logind or run logind without systemd init. Commit 66e41181 fixed sd_booted() to only succeed for systemd init; with that, testing for systemd init is wrong in the parts that talk to logind. In particular, this affects the PAM module and the "uaccess" udev builtin. Change sd_booted() to a new logind_running() which tests for /run/systemd/seats/. For details, see: <https://mail.gnome.org/archives/desktop-devel-list/2013-March/msg00092.html> https://bugs.freedesktop.org/show_bug.cgi?id=62754
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/udev-builtin-uaccess.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c
index 662bac9e0b..354ee08f28 100644
--- a/src/udev/udev-builtin-uaccess.c
+++ b/src/udev/udev-builtin-uaccess.c
@@ -29,7 +29,6 @@
#include <dirent.h>
#include <getopt.h>
-#include <systemd/sd-daemon.h>
#include <systemd/sd-login.h>
#include "logind-acl.h"
#include "udev.h"
@@ -49,7 +48,7 @@ static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool
umask(0022);
/* don't muck around with ACLs when the system is not running systemd */
- if (!sd_booted())
+ if (!logind_running())
return 0;
path = udev_device_get_devnode(dev);