From 539072153c0db3d91c1c59ad447d96b0e1f3cf77 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 29 Jun 2011 19:41:07 +0200 Subject: acl: libudev currently doesn't handle properly enumerator matches with multiple tags, so avoid using them for now --- src/logind-acl.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/logind-acl.c') 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); -- cgit v1.2.3-54-g00ecf