diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-06-29 19:41:07 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-06-29 19:41:07 +0200 |
| commit | 539072153c0db3d91c1c59ad447d96b0e1f3cf77 (patch) | |
| tree | 21831c2b2d68a86d7f1656eee53f6b838b1bcec4 /src | |
| parent | f5f32cd7adb78d390fa9050588095b3d31c8527b (diff) | |
acl: libudev currently doesn't handle properly enumerator matches with multiple tags, so avoid using them for now
Diffstat (limited to 'src')
| -rw-r--r-- | src/logind-acl.c | 20 | ||||
| -rw-r--r-- | src/logind.c | 2 | ||||
| -rw-r--r-- | src/logind.h | 1 | ||||
| -rw-r--r-- | src/uaccess.c | 2 |
4 files changed, 15 insertions, 10 deletions
diff --git a/src/logind-acl.c b/src/logind-acl.c index 7571093d0e..59af981a5e 100644 --- a/src/logind-acl.c +++ b/src/logind-acl.c @@ -222,7 +222,7 @@ int devnode_acl_all(struct udev *udev, assert(udev); - if (!seat) + if (isempty(seat)) seat = "seat0"; e = udev_enumerate_new(udev); @@ -233,11 +233,13 @@ int devnode_acl_all(struct udev *udev, if (r < 0) goto finish; - if (!streq(seat, "seat0")) { - r = udev_enumerate_add_match_tag(e, seat); - 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) @@ -254,8 +256,8 @@ int devnode_acl_all(struct udev *udev, goto finish; } - sn = udev_device_get_property_value(d, "SEAT"); - if (!sn) + sn = udev_device_get_property_value(d, "ID_SEAT"); + if (isempty(sn)) sn = "seat0"; if (!streq(seat, sn)) { @@ -270,6 +272,8 @@ int devnode_acl_all(struct udev *udev, goto finish; } + log_debug("Fixing up %s for seat %s...", node, sn); + r = devnode_acl(node, flush, del, old_uid, add, new_uid); udev_device_unref(d); diff --git a/src/logind.c b/src/logind.c index 9bab875131..cbc878e682 100644 --- a/src/logind.c +++ b/src/logind.c @@ -286,7 +286,7 @@ int manager_process_seat_device(Manager *m, struct udev_device *d) { Seat *seat; sn = udev_device_get_property_value(d, "ID_SEAT"); - if (!sn) + if (isempty(sn)) sn = "seat0"; if (!seat_name_is_valid(sn)) { diff --git a/src/logind.h b/src/logind.h index aaa21cddda..7e47bc3489 100644 --- a/src/logind.h +++ b/src/logind.h @@ -45,6 +45,7 @@ * trigger based on libudev if available * enumerate recursively with libudev when triggering * use sysfs in device hash table, not sysname, when fb driver is fixed + * fix ACL enumeration as soon as libudev can properly handle two match tags when enumerating * * non-local X11 server * reboot/shutdown halt management diff --git a/src/uaccess.c b/src/uaccess.c index 2f6ac43754..1683707977 100644 --- a/src/uaccess.c +++ b/src/uaccess.c @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { } path = argv[1]; - seat = argc >= 3 ? argv[2] : "seat0"; + seat = argc < 3 || isempty(argv[2]) ? "seat0" : argv[2]; p = strappend("/run/systemd/seats/", seat); if (!p) { |