X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogind-acl.c;h=7a06b501d45fbe420caae814abf40f54347e3011;hb=7fc2a89a7387db1e5daa4892393c9e9536920c25;hp=59af981a5ecb5d33c56830e4a877af4dab288f4d;hpb=539072153c0db3d91c1c59ad447d96b0e1f3cf77;p=elogind.git

diff --git a/src/logind-acl.c b/src/logind-acl.c
index 59af981a5..7a06b501d 100644
--- a/src/logind-acl.c
+++ b/src/logind-acl.c
@@ -105,7 +105,7 @@ int devnode_acl(const char *path,
                 bool add, uid_t new_uid) {
 
         acl_t acl;
-        int r;
+        int r = 0;
         bool changed = false;
 
         assert(path);
@@ -229,18 +229,16 @@ int devnode_acl_all(struct udev *udev,
         if (!e)
                 return -ENOMEM;
 
+        /* We can only match by one tag in libudev. We choose
+         * "uaccess" for that. If we could match for two tags here we
+         * could add the seat name as second match tag, but this would
+         * be hardly optimizable in libudev, and hence checking the
+         * second tag manually in our loop is a good solution. */
+
         r = udev_enumerate_add_match_tag(e, "uaccess");
         if (r < 0)
                 goto finish;
 
-        /* FIXME: when libudev is able to handle multiple match tags
-         * properly, optimize the search here a bit */
-        /* if (!streq(seat, "seat0")) { */
-        /*         r = udev_enumerate_add_match_tag(e, seat); */
-        /*         if (r < 0) */
-        /*                 goto finish; */
-        /* } */
-
         r = udev_enumerate_scan_devices(e);
         if (r < 0)
                 goto finish;
@@ -267,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);