hal: Branch 'master'

[David Zeuthen]

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

New commits:
diff-tree eb21c07c30222aa05fd006ecc4f242f2a0598303 (from 5158e179937a70ebed6bc9436d00ffa37ff3707a)
Author: David Zeuthen <davidz at redhat.com>
Date:   Thu Mar 1 14:51:53 2007 -0500

    assign ACL's to Firewire IIDC (including iSight) and AVC devices

diff --git a/fdi/policy/10osvendor/20-acl-management.fdi b/fdi/policy/10osvendor/20-acl-management.fdi
index 41b9ebd..d1490e0 100644
--- a/fdi/policy/10osvendor/20-acl-management.fdi
+++ b/fdi/policy/10osvendor/20-acl-management.fdi
@@ -44,6 +44,15 @@
       </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>
+      <merge key="access_control.file" type="copy_property">@ieee1394_unit.originating_device:ieee1394.device</merge>
+    </match>
+    <match key="info.capabilities" contains="ieee1394_unit.avc">
+      <append key="info.capabilities" type="strlist">access_control</append>
+      <merge key="access_control.file" type="copy_property">@ieee1394_unit.originating_device:ieee1394.device</merge>
+    </match>
 
     <!-- policy goes here - this can be amended by 3rd party packages,
          e.g.  the flumotion package may provide a fdi-file that