hal: Branch 'master'

[David Zeuthen]

 fdi/policy/10osvendor/20-acl-management.fdi |    8 ++++++++
 1 files changed, 8 insertions(+)

New commits:
diff-tree f10aff4fe085ac9f07dd053e2067dde3b1fcdcca (from 5840b9a5296af0790334c7261eadfa5e21b432b0)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Mar 19 22:51:11 2007 -0400

    add ACL's for scanners

diff --git a/fdi/policy/10osvendor/20-acl-management.fdi b/fdi/policy/10osvendor/20-acl-management.fdi
index d1490e0..74665d4 100644
--- a/fdi/policy/10osvendor/20-acl-management.fdi
+++ b/fdi/policy/10osvendor/20-acl-management.fdi
@@ -44,6 +44,14 @@
       </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>
+	<merge key="access_control.file" type="copy_property">usbraw.device</merge>
+      </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>