udev-acl: ACL_SET -> ACL_MANAGE

3 files changed, 12 insertions, 12 deletions

diff --git a/NEWS b/NEWS
index 46032c2..0148ae0 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ PulseAudio.
 
 New udev-acl tool to grant local useres access to devices by
 adding an access control list for the user's uid. All devices
-tagged with the ACL_SET=1 tag will get an ACL assigned for all
+tagged with the ACL_MANAGE=1 tag will get an ACL assigned for all
 locally logged-in users. It hooks into the udev event process
 for new devices, and ConsoleKit for users logging in and out.
 This will replace the ACL management in HAL.
diff --git a/udev-acl/70-acl.rules b/udev-acl/70-acl.rules
index 708198a..4e5065b 100644
--- a/udev-acl/70-acl.rules
+++ b/udev-acl/70-acl.rules
@@ -5,30 +5,30 @@ ACTION!="add|change", GOTO="acl_apply"
 
 # PTP/MTP protocol devices, cameras, portable media players
 SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="", ENV{DEVTYPE}=="usb_device", IMPORT{program}="usb_id --export %p"
-SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", ENV{ACL_SET}="1"
+SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", ENV{ACL_MANAGE}="1"
 
 # SCSI scanners
-KERNEL=="sg[0-9]*", ATTRS{type}=="6", ENV{ACL_SET}="1"
-KERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="HP|EPSON|Epson", ENV{ACL_SET}="1"
+KERNEL=="sg[0-9]*", ATTRS{type}=="6", ENV{ACL_MANAGE}="1"
+KERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="HP|EPSON|Epson", ENV{ACL_MANAGE}="1"
 
 # USB scanners
-ENV{libsane_matched}=="yes", ENV{ACL_SET}="1"
+ENV{libsane_matched}=="yes", ENV{ACL_MANAGE}="1"
 
 # optical drives
-SUBSYSTEM=="block", ENV{ID_CDROM}=="1", ENV{ACL_SET}="1"
+SUBSYSTEM=="block", ENV{ID_CDROM}=="1", ENV{ACL_MANAGE}="1"
 
 # sound devices
-SUBSYSTEM=="sound", ENV{ACL_SET}="1"
+SUBSYSTEM=="sound", ENV{ACL_MANAGE}="1"
 
 # webcams, frame grabber, TV cards
-SUBSYSTEM=="video4linux", ENV{ACL_SET}="1"
-SUBSYSTEM=="dvb", ENV{ACL_SET}="1"
+SUBSYSTEM=="video4linux", ENV{ACL_MANAGE}="1"
+SUBSYSTEM=="dvb", ENV{ACL_MANAGE}="1"
 
 # fingerprint readers
-SUBSYSTEM=="usb", ATTR{idVendor}=="0483", ATTR{idProduct}=="2016", ENV{ACL_SET}="1"
+SUBSYSTEM=="usb", ATTR{idVendor}=="0483", ATTR{idProduct}=="2016", ENV{ACL_MANAGE}="1"
 
 # apply ACL for all locally logged in users
-LABEL="acl_apply", ENV{ACL_SET}=="?*", TEST=="/var/run/ConsoleKit/database", \
+LABEL="acl_apply", ENV{ACL_MANAGE}=="?*", TEST=="/var/run/ConsoleKit/database", \
   RUN+="udev-acl --action=$env{ACTION} --device=$env{DEVNAME}"
 
 LABEL="acl_end"
diff --git a/udev-acl/udev-acl.c b/udev-acl/udev-acl.c
index 5bac6bd..5dca734 100644
--- a/udev-acl/udev-acl.c
+++ b/udev-acl/udev-acl.c
@@ -204,7 +204,7 @@ static void apply_acl_to_devices(uid_t uid, int add)
 	/* iterate over all devices tagged with ACL_SET */
 	udev = udev_new();
 	enumerate = udev_enumerate_new(udev);
-	udev_enumerate_add_match_property(enumerate, "ACL_SET", "1");
+	udev_enumerate_add_match_property(enumerate, "ACL_MANAGE", "*");
 	udev_enumerate_scan_devices(enumerate);
 	udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(enumerate)) {
 		struct udev_device *device;