hal: Branch 'master'

[Danny Kukawka]

 fdi/policy/10osvendor/20-acl-management.fdi     |    5 +++++
 policy/org.freedesktop.hal.device-access.policy |    9 +++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 401e7a3a8bf675bda2a7e52d355d3047898b4f50
Author: Alex Kanavin <ak at sensi.org>
Date:   Mon Oct 20 15:32:14 2008 +0200

    add ACL rule an policy for obex devices
    
    Added ACL rule an policy for obex devices.

diff --git a/fdi/policy/10osvendor/20-acl-management.fdi b/fdi/policy/10osvendor/20-acl-management.fdi
index 32becbc..6260970 100644
--- a/fdi/policy/10osvendor/20-acl-management.fdi
+++ b/fdi/policy/10osvendor/20-acl-management.fdi
@@ -93,6 +93,11 @@
           <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 key="info.capabilities" contains="obex">
+          <append key="info.capabilities" type="strlist">access_control</append>
+          <merge key="access_control.type" type="string">obex</merge>
+          <merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>
+        </match>
       </match>
     </match>
 
diff --git a/policy/org.freedesktop.hal.device-access.policy b/policy/org.freedesktop.hal.device-access.policy
index cacc88f..2656afd 100644
--- a/policy/org.freedesktop.hal.device-access.policy
+++ b/policy/org.freedesktop.hal.device-access.policy
@@ -151,4 +151,13 @@ details.
     </defaults>
   </action>
 
+  <action id="org.freedesktop.hal.device-access.obex">
+    <description>Directly access OBEX devices</description>
+    <message>System policy prevents access to OBEX devices</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
 </policyconfig>