From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 25 Aug 2011 14:50:49 +0000 (+0200)
Subject: acl: properly handle if devices are tagged as uaccess but do not have a device node
X-Git-Tag: v34~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d2d4b038999d65826a2048a1a7829f9d5e762978

acl: properly handle if devices are tagged as uaccess but do not have a device node
---

diff --git a/src/73-seat-late.rules.in b/src/73-seat-late.rules.in
index e93a0e6da..0847932d7 100644
--- a/src/73-seat-late.rules.in
+++ b/src/73-seat-late.rules.in
@@ -12,6 +12,6 @@ ENV{ID_SEAT}=="", IMPORT{parent}="ID_SEAT"
 
 ENV{ID_SEAT}!="", TAG+="$env{ID_SEAT}"
 
-TAG=="uaccess", RUN+="@rootlibexecdir@/systemd-uaccess $env{DEVNAME} $env{ID_SEAT}"
+TAG=="uaccess", ENV{MAJOR}!="", RUN+="@rootlibexecdir@/systemd-uaccess $env{DEVNAME} $env{ID_SEAT}"
 
 LABEL="seat_late_end"
diff --git a/src/logind-acl.c b/src/logind-acl.c
index 7f9b0ca15..7a06b501d 100644
--- a/src/logind-acl.c
+++ b/src/logind-acl.c
@@ -265,9 +265,9 @@ int devnode_acl_all(struct udev *udev,
 
                 node = udev_device_get_devnode(d);
                 if (!node) {
+                        /* In case people mistag devices with nodes, we need to ignore this */
                         udev_device_unref(d);
-                        r = -ENOMEM;
-                        goto finish;
+                        continue;
                 }
 
                 log_debug("Fixing up %s for seat %s...", node, sn);