X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-acl.c;h=1b69f4b9ca77b449f1abeac11c2f9c7c8e757058;hb=7d6db950f0175b36ce0c23e551d45ebbac8eaa26;hp=390b4b28857f77094ae63020c0d7c6f0f0a27820;hpb=db0c1e3bd39c9151ba4ac8e029ec77a4ec923bd1;p=elogind.git
diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index 390b4b288..1b69f4b9c 100644
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
@@ -19,16 +17,20 @@
along with systemd; If not, see .
***/
-#include
-#include
-#include
#include
#include
-#include "logind-acl.h"
-#include "util.h"
#include "acl-util.h"
+#include "alloc-util.h"
+#include "dirent-util.h"
+#include "escape.h"
+#include "fd-util.h"
+#include "format-util.h"
+#include "logind-acl.h"
#include "set.h"
+#include "string-util.h"
+#include "udev-util.h"
+#include "util.h"
static int flush_acl(acl_t acl) {
acl_entry_t i;
@@ -178,27 +180,24 @@ int devnode_acl_all(struct udev *udev,
bool del, uid_t old_uid,
bool add, uid_t new_uid) {
+ _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL;
struct udev_list_entry *item = NULL, *first = NULL;
- struct udev_enumerate *e;
- Set *nodes;
- Iterator i;
- char *n;
+ _cleanup_set_free_free_ Set *nodes = NULL;
_cleanup_closedir_ DIR *dir = NULL;
struct dirent *dent;
+ Iterator i;
+ char *n;
int r;
assert(udev);
- nodes = set_new(string_hash_func, string_compare_func);
- if (!nodes) {
+ nodes = set_new(&string_hash_ops);
+ if (!nodes)
return -ENOMEM;
- }
e = udev_enumerate_new(udev);
- if (!e) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!e)
+ return -ENOMEM;
if (isempty(seat))
seat = "seat0";
@@ -210,85 +209,84 @@ int devnode_acl_all(struct udev *udev,
* second tag manually in our loop is a good solution. */
r = udev_enumerate_add_match_tag(e, "uaccess");
if (r < 0)
- goto finish;
+ return r;
+
+ r = udev_enumerate_add_match_is_initialized(e);
+ if (r < 0)
+ return r;
r = udev_enumerate_scan_devices(e);
if (r < 0)
- goto finish;
+ return r;
first = udev_enumerate_get_list_entry(e);
udev_list_entry_foreach(item, first) {
- struct udev_device *d;
+ _cleanup_udev_device_unref_ struct udev_device *d = NULL;
const char *node, *sn;
d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
- if (!d) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!d)
+ return -ENOMEM;
sn = udev_device_get_property_value(d, "ID_SEAT");
if (isempty(sn))
sn = "seat0";
- if (!streq(seat, sn)) {
- udev_device_unref(d);
+ if (!streq(seat, sn))
continue;
- }
node = udev_device_get_devnode(d);
- if (!node) {
- /* In case people mistag devices with nodes, we need to ignore this */
- udev_device_unref(d);
+ /* In case people mistag devices with nodes, we need to ignore this */
+ if (!node)
continue;
- }
n = strdup(node);
- udev_device_unref(d);
if (!n)
- goto finish;
+ return -ENOMEM;
log_debug("Found udev node %s for seat %s", n, seat);
- r = set_put(nodes, n);
+ r = set_consume(nodes, n);
if (r < 0)
- goto finish;
+ return r;
}
/* 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) {
+ FOREACH_DIRENT(dent, dir, return -errno) {
_cleanup_free_ char *unescaped_devname = NULL;
- unescaped_devname = cunescape(dent->d_name);
- if (unescaped_devname == NULL) {
- r = -ENOMEM;
- goto finish;
- }
+ if (cunescape(dent->d_name, UNESCAPE_RELAX, &unescaped_devname) < 0)
+ return -ENOMEM;
n = strappend("/dev/", unescaped_devname);
- if (!n) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!n)
+ return -ENOMEM;
log_debug("Found static node %s for seat %s", n, seat);
- r = set_put(nodes, n);
- if (0 && r < 0 && r != -EEXIST) {
- goto finish;
- } else
- r = 0;
+ r = set_consume(nodes, n);
+ if (r == -EEXIST)
+ continue;
+ if (r < 0)
+ return r;
}
}
+ 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);
+ int k;
+
+ log_debug("Changing ACLs at %s for seat %s (uid "UID_FMT"â"UID_FMT"%s%s)",
+ n, seat, old_uid, new_uid,
+ del ? " del" : "", add ? " add" : "");
+
+ k = devnode_acl(n, flush, del, old_uid, add, new_uid);
+ if (k == -ENOENT)
+ log_debug("Device %s disappeared while setting ACLs", n);
+ else if (k < 0 && r == 0)
+ r = k;
}
-finish:
- udev_enumerate_unref(e);
- set_free_free(nodes);
return r;
}