dhcp: Add function to free DHCP client data

[elogind.git] / src / login / logind-acl.c

diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index cb045a99285cddbe859688a7beb8f8baa36539ba..2df2ba2c17fb0b38f0d3d81efe39390ecda18f2a 100644 (file)
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -20,14 +20,15 @@
 ***/
 
 #include <assert.h>
-#include <sys/acl.h>
-#include <acl/libacl.h>
 #include <errno.h>
 #include <string.h>
+#include <sys/acl.h>
+#include <acl/libacl.h>
 
-#include "logind-acl.h"
 #include "util.h"
 #include "acl-util.h"
+#include "set.h"
+#include "logind-acl.h"
 
 static int flush_acl(acl_t acl) {
         acl_entry_t i;
@@ -179,23 +180,33 @@ int devnode_acl_all(struct udev *udev,
 
         struct udev_list_entry *item = NULL, *first = NULL;
         struct udev_enumerate *e;
+        Set *nodes;
+        Iterator i;
+        char *n;
+        _cleanup_closedir_ DIR *dir = NULL;
+        struct dirent *dent;
         int r;
 
         assert(udev);
 
-        if (isempty(seat))
-                seat = "seat0";
+        nodes = set_new(string_hash_func, string_compare_func);
+        if (!nodes)
+                return -ENOMEM;
 
         e = udev_enumerate_new(udev);
-        if (!e)
-                return -ENOMEM;
+        if (!e) {
+                r = -ENOMEM;
+                goto finish;
+        }
+
+        if (isempty(seat))
+                seat = "seat0";
 
         /* 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;
@@ -231,18 +242,52 @@ int devnode_acl_all(struct udev *udev,
                         continue;
                 }
 
-                log_debug("Fixing up %s for seat %s...", node, sn);
-
-                r = devnode_acl(node, flush, del, old_uid, add, new_uid);
+                n = strdup(node);
                 udev_device_unref(d);
+                if (!n)
+                        goto finish;
 
+                log_debug("Found udev node %s for seat %s", n, seat);
+                r = set_put(nodes, n);
                 if (r < 0)
                         goto finish;
         }
 
-finish:
-        if (e)
-                udev_enumerate_unref(e);
+        /* udev exports "dead" device nodes to allow module on-demand loading,
+         * these devices are not known to the kernel at this moment */
+        dir = opendir("/run/udev/static_node-tags/uaccess");
+        if (dir) {
+                FOREACH_DIRENT(dent, dir, r = -errno; goto finish) {
+                        _cleanup_free_ char *unescaped_devname = NULL;
+
+                        unescaped_devname = cunescape(dent->d_name);
+                        if (unescaped_devname == NULL) {
+                                r = -ENOMEM;
+                                goto finish;
+                        }
+
+                        n = strappend("/dev/", unescaped_devname);
+                        if (!n) {
+                                r = -ENOMEM;
+                                goto finish;
+                        }
+
+                        log_debug("Found static node %s for seat %s", n, seat);
+                        r = set_put(nodes, n);
+                        if (r < 0 && r != -EEXIST)
+                                goto finish;
+                        else
+                                r = 0;
+                }
+        }
+
+        SET_FOREACH(n, nodes, i) {
+                log_debug("Fixing up ACLs at %s for seat %s", n, seat);
+                r = devnode_acl(n, flush, del, old_uid, add, new_uid);
+        }
 
+finish:
+        udev_enumerate_unref(e);
+        set_free_free(nodes);
         return r;
 }