X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fudev-acl%2F70-acl.rules;h=78e3ebae5351f43d0874c414a5e9147c107001da;hp=26b805565abb9e11ca9d35d08e3eda0fa378b5c3;hb=456863e3514d5432e1540c9017731d3e7612e20b;hpb=9ab11b6258abe2c9c0420a70e5b21f3f341c82c5

diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules
index 26b805565..78e3ebae5 100644
--- a/extras/udev-acl/70-acl.rules
+++ b/extras/udev-acl/70-acl.rules
@@ -1,6 +1,7 @@
 # do not edit this file, it will be overwritten on update
 
 ENV{MAJOR}=="", GOTO="acl_end"
+ENV{ACL_MANAGE}=="0", GOTO="acl_end"
 ACTION!="add|change", GOTO="acl_apply"
 
 # PTP/MTP protocol devices, cameras, portable media players
@@ -32,6 +33,15 @@ SUBSYSTEM=="input", SUBSYSTEMS=="sound", ENV{ACL_MANAGE}="1"
 SUBSYSTEM=="video4linux", ENV{ACL_MANAGE}="1"
 SUBSYSTEM=="dvb", ENV{ACL_MANAGE}="1"
 
+# IIDC devices: industrial cameras and some webcams
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*",  ENV{ACL_MANAGE}="1"
+# AV/C devices: camcorders, set-top boxes, TV sets, audio devices, and more
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", ENV{ACL_MANAGE}="1"
+
+# old style firewire devices
+KERNEL=="dv1394-[0-9]*", ENV{ACL_MANAGE}="1"
+KERNEL=="video1394-[0-9]*", ENV{ACL_MANAGE}="1"
+
 # fingerprint readers
 SUBSYSTEM=="usb", ATTR{idVendor}=="0483", ATTR{idProduct}=="2016", ENV{ACL_MANAGE}="1"
 
@@ -41,6 +51,18 @@ SUBSYSTEM=="drm", KERNEL=="card*", ENV{ACL_MANAGE}="1"
 # KVM
 SUBSYSTEM=="misc", KERNEL=="kvm", ENV{ACL_MANAGE}="1"
 
+# smart-card readers
+ENV{ID_SMARTCARD_READER}=="*?", ENV{ACL_MANAGE}="1"
+
+# joysticks
+SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", ENV{ACL_MANAGE}="1"
+
+# smart phones
+SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", ENV{ACL_MANAGE}="1"
+
+# color measurement devices
+ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}="1"
+
 # apply ACL for all locally logged in users
 LABEL="acl_apply", ENV{ACL_MANAGE}=="?*", TEST=="/var/run/ConsoleKit/database", \
   RUN+="udev-acl --action=$env{ACTION} --device=$env{DEVNAME}"