hal: Branch 'master'

[David Zeuthen]

 fdi/policy/10osvendor/20-acl-management.fdi |    5 +++++
 policy/hal-device-file.policy               |   10 ++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit cebc92a9b2bc62442fbde76064540df5c03ff060
Author: Linus Walleij <linus.ml.walleij at gmail.com>
Date:   Mon Mar 3 18:24:04 2008 -0500

    add acls to USB based audio players
    
    We have a few audio players accessing USB in raw mode
    using libusb. Fedora is starting to rely on ACLs for this,
    so HAL has to do the grunt work. (We used to use
    pam_console, no good.)
    
    (patch slightly tweaked by davidz)

diff --git a/fdi/policy/10osvendor/20-acl-management.fdi b/fdi/policy/10osvendor/20-acl-management.fdi
index 1497339..50294e3 100644
--- a/fdi/policy/10osvendor/20-acl-management.fdi
+++ b/fdi/policy/10osvendor/20-acl-management.fdi
@@ -71,6 +71,11 @@
           <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 key="info.capabilities" contains="portable_audio_player">
+          <append key="info.capabilities" type="strlist">access_control</append>
+          <merge key="access_control.type" type="string">audio-player</merge>
+          <merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>
+        </match>
       </match>
     </match>
 
diff --git a/policy/hal-device-file.policy b/policy/hal-device-file.policy
index d1318b6..12027b9 100644
--- a/policy/hal-device-file.policy
+++ b/policy/hal-device-file.policy
@@ -69,6 +69,16 @@ details.
       <allow_active>yes</allow_active>
     </defaults>
   </action>
+
+  <action id="org.freedesktop.hal.device-access.audio-player">
+    <description>Directly access audio players</description>
+    <message>System policy prevents access to audio players</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
   
   <action id="org.freedesktop.hal.device-access.ieee1394-iidc">
     <description>Directly access Firewire IIDC devices</description>