hal: Branch 'master'

[David Zeuthen]

 fdi/policy/10osvendor/20-acl-management.fdi |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

New commits:
diff-tree 2f0499ff4b9b814d4e444348d6dcd313804ddcce (from afcd255ed7dd4729824242f216549c24b5a7a603)
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Aug 14 14:40:19 2007 -0400

    support for ACL on USB devices where the device node is on the real device

diff --git a/fdi/policy/10osvendor/20-acl-management.fdi b/fdi/policy/10osvendor/20-acl-management.fdi
index 28b3101..1497339 100644
--- a/fdi/policy/10osvendor/20-acl-management.fdi
+++ b/fdi/policy/10osvendor/20-acl-management.fdi
@@ -42,7 +42,7 @@
       <merge key="access_control.type" type="string">dvb</merge>
     </match>
 
-    <!-- usb cameras -->
+    <!-- support for Linux USB stack where device node is on a child of the main USB device -->
     <match key="info.capabilities" contains="usbraw">
       <match key="info.capabilities" sibling_contains="camera">
 	<append key="info.capabilities" type="strlist">access_control</append>
@@ -50,8 +50,6 @@
         <merge key="access_control.type" type="string">camera</merge>
       </match>
     </match>
-
-    <!-- usb scanners -->
     <match key="info.capabilities" contains="usbraw">
       <match key="info.capabilities" sibling_contains="scanner">
 	<append key="info.capabilities" type="strlist">access_control</append>
@@ -60,6 +58,23 @@
       </match>
     </match>
 
+    <!-- support for Linux USB stack where linux.device_file is set (e.g. device node is on the main usb device) -->
+    <match key="info.subsystem" string="usb">
+      <match key="@info.parent:linux.device_file" exists="true">
+        <match key="info.capabilities" contains="camera">
+          <append key="info.capabilities" type="strlist">access_control</append>
+          <merge key="access_control.type" type="string">camera</merge>
+          <merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>
+        </match>
+        <match key="info.capabilities" contains="scanner">
+          <append key="info.capabilities" type="strlist">access_control</append>
+          <merge key="access_control.type" type="string">scanner</merge>
+          <merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>
+        </match>
+      </match>
+    </match>
+
+
     <!-- Firewire devices are mostly driven by userspace libraries -->
     <match key="info.capabilities" contains="ieee1394_unit.iidc">
       <append key="info.capabilities" type="strlist">access_control</append>