hal: Branch 'master' - 2 commits

[Danny Kukawka]

 doc/spec/hal-spec-properties.xml                |   50 ++++++++++++++++++++++++
 fdi/policy/10osvendor/20-acl-management.fdi     |   12 +++++
 policy/org.freedesktop.hal.device-access.policy |    9 ++++
 3 files changed, 71 insertions(+)

New commits:
commit 4fc860155b36d7767222ed92e640c07fd4a92019
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Oct 27 11:17:49 2008 +0100

    added ACL/device access rules for fingerprint reader
    
    Added ACL/device access rules for fingerprint reader.

diff --git a/fdi/policy/10osvendor/20-acl-management.fdi b/fdi/policy/10osvendor/20-acl-management.fdi
index c380807..4b0c616 100644
--- a/fdi/policy/10osvendor/20-acl-management.fdi
+++ b/fdi/policy/10osvendor/20-acl-management.fdi
@@ -74,6 +74,13 @@
 	<merge key="access_control.type" type="string">scanner</merge>
       </match>
     </match>
+    <match key="info.capabilities" contains="usbraw">
+      <match key="info.capabilities" sibling_contains="biometic.fingerprint_reader">
+	<append key="info.capabilities" type="strlist">access_control</append>
+	<merge key="access_control.file" type="copy_property">usbraw.device</merge>
+	<merge key="access_control.type" type="string">fingerprint-reader</merge>
+      </match>
+    </match>
 
     <!-- support for Linux USB stack where linux.device_file is set (e.g. device node is on the main usb device) -->
     <match key="info.subsystem" string="usb">
@@ -98,6 +105,11 @@
           <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 key="info.capabilities" contains="biometric.fingerprint_reader">
+          <append key="info.capabilities" type="strlist">access_control</append>
+          <merge key="access_control.type" type="string">fingerprint-reader</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 41c0afe..3c07e72 100644
--- a/policy/org.freedesktop.hal.device-access.policy
+++ b/policy/org.freedesktop.hal.device-access.policy
@@ -19,6 +19,15 @@ NOTE: Please keep the actions in alpabetical order
 
 <policyconfig>
 
+  <action id="org.freedesktop.hal.device-access.fingerprint-reader">
+    <description>Directly access to fingerprint reader devices</description>
+    <message>System policy prevents access to fingerprint readers</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <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>
commit af71a0cb2536741c8847ffdac395bd9f0b5eef83
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Oct 27 11:15:11 2008 +0100

    add biometric and biometric.fingerprint_reader namespace
    
    Added new biometric and biometric.fingerprint_reader namespaces
    to the spec.
    
    Note: a library listed in biometric.fingerprint_reader.access_method
    can create a own new subnamspace called e.g. (in case of libfprint)
    biometric.fingerprint_reader.libfprint.*

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index b05a420..ad058d8 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -4296,6 +4296,56 @@ org.freedesktop.Hal.Device.Volume.method_signatures = {'ssas', 'as', 'as'}
       </informaltable>
     </sect2>
 
+    <sect2 id="device-properties-biometric">
+      <title>
+        biometric namespace
+      </title>
+      <para>
+	Device objects with the capability <literal>biometric</literal> represent
+	a biometric device (e.g. fingerprint reader) . No namespace specific
+        properties.
+      </para>
+    </sect2>
+
+    <sect2 id="device-properties-biometric-fingerprint_reader">
+      <title>
+        biometric.fingerprint_reader namespace
+      </title>
+      <para>
+	Device objects with the capabilities <literal>biometric.fingerprint_reader</literal> 
+	and <literal>biometric</literal> represent a biometric fingerprint reader.
+      </para>
+      <informaltable>
+        <tgroup cols="2">
+          <thead>
+            <row>
+              <entry>Key (type)</entry>
+              <entry>Values</entry>
+              <entry>Mandatory</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry>
+                <literal>biometric.fingerprint_reader.access_method</literal> (strlist)
+              </entry>
+              <entry>example: libfprint</entry>
+              <entry>No</entry>
+              <entry>
+                Indicates installed device driver libraries that can handle this device.  
+		These drivers can export information in 
+		<literal>biometric.fingerprint_reader.[access_method]</literal> sub-namespaces.
+		Can also be used by libraries or programs providing extra device information 
+		to indicate the presence of this information in the appropriate sub-namespace.
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </sect2>
+
+
     <sect2 id="device-properties-button">
       <title>
         button namespace