hal: Branch 'master'

[Danny Kukawka]

 fdi/policy/10osvendor/20-acl-management.fdi |   25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

New commits:
commit 6c7a7aeea3aef5828d3f011107003371588292fa
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Oct 21 11:12:07 2008 +0200

    fixed ACL rules for PDAs
    
    Fixed ACL rules for PDAs:
    - set access_control.file correctly to pda.*.hotsync_interface
    - use only one section for pocketpc and palm PDAs

diff --git a/fdi/policy/10osvendor/20-acl-management.fdi b/fdi/policy/10osvendor/20-acl-management.fdi
index 0e425b3..c380807 100644
--- a/fdi/policy/10osvendor/20-acl-management.fdi
+++ b/fdi/policy/10osvendor/20-acl-management.fdi
@@ -114,15 +114,6 @@
       <merge key="access_control.type" type="string">ieee1394-avc</merge>
     </match>
 
-    <!-- PalmOS PDAs -->
-    <match key="info.capabilities" contains="pda">
-      <match key="pda.platform" string="palm">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.type" type="string">pda</merge>
-        <merge key="access_control.file" type="copy_property">pda</merge>
-      </match>
-    </match>
-
     <!-- serial devices are assumed to be modems by default (no access) -->
     <match key="info.category" string="serial">
       <match key="serial.device" exists="true">
@@ -142,11 +133,17 @@
     </match>
 
     <!-- after serial to be able to override restrictive default -->
-    <!-- FIXME: check if redundant with above "PalmOS PDAs" section -->
-    <match key="pda.platform" exists="true">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.type" type="string">pda</merge>
-        <merge key="access_control.file" type="copy_property">pda</merge>
+    <match key="info.capabilities" contains="pda">
+      <!-- PalmOS PDAs -->
+      <append key="info.capabilities" type="strlist">access_control</append>
+      <merge key="access_control.type" type="string">pda</merge>
+      <match key="pda.platform" string="palm">
+        <merge key="access_control.file" type="copy_property">pda.palm.hotsync_interface</merge>
+      </match>
+      <!-- PocketPC PDAs -->
+      <match key="pda.platform" string="pocketpc">
+        <merge key="access_control.file" type="copy_property">pda.pocketpc.hotsync_interface</merge>
+      </match>
     </match>
 
     <!-- plain old floppy -->