summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Page <hal-list@krp.org.uk>2008-03-13 19:10:51 +0100
committerDanny Kukawka <danny.kukawka@web.de>2008-03-13 19:10:51 +0100
commitaf4487e991bbba50c7be29b9709da37e45fc20a8 (patch)
tree00f189650ab3d67af5b059339c0836970f20abbc
parent0e0938e87a16791322561897ad2ca2459fc3983e (diff)
add ACL policy for Palm PDA device files
Added ACL policy for Palm PDA device files to enable active access to PDAs through PolicyKit. There's also a small correction to a comment in 20-acl-management.fdi This is an attempt to push upstream work (by many) from: https://bugzilla.redhat.com/show_bug.cgi?id=280251 We've numerous reports of this working successfully for users. It currently matches only PalmOS PDAs; it could more broadly match all PDA devices, though I have no experience of e.g. Windows Mobile devices.
-rw-r--r--fdi/policy/10osvendor/20-acl-management.fdi11
-rw-r--r--policy/org.freedesktop.hal.device-access.policy10
2 files changed, 19 insertions, 2 deletions
diff --git a/fdi/policy/10osvendor/20-acl-management.fdi b/fdi/policy/10osvendor/20-acl-management.fdi
index 50294e37..5620cae8 100644
--- a/fdi/policy/10osvendor/20-acl-management.fdi
+++ b/fdi/policy/10osvendor/20-acl-management.fdi
@@ -3,7 +3,7 @@
<deviceinfo version="0.2">
<device>
- <!-- NOTE: if you add a new access.type value, remember to update privileges/hal-device-files.priv -->
+ <!-- NOTE: if you add a new access.type value, remember to update policy/hal-device-file.policy -->
<!-- classification of devices where access can be controlled goes here -->
@@ -92,6 +92,15 @@
<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.palm.hotsync_interface</merge>
+ </match>
+ </match>
+
<!-- enforcement of policy goes here -->
<!-- add / remove ACL's when devices are added and removed -->
diff --git a/policy/org.freedesktop.hal.device-access.policy b/policy/org.freedesktop.hal.device-access.policy
index 12027b9c..a7adf9f9 100644
--- a/policy/org.freedesktop.hal.device-access.policy
+++ b/policy/org.freedesktop.hal.device-access.policy
@@ -78,7 +78,6 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
<action id="org.freedesktop.hal.device-access.ieee1394-iidc">
<description>Directly access Firewire IIDC devices</description>
@@ -98,4 +97,13 @@ details.
</defaults>
</action>
+ <action id="org.freedesktop.hal.device-access.pda">
+ <description>Directly access PDA devices</description>
+ <message>System policy prevents access to PDA devices</message>
+ <defaults>
+ <allow_inactive>no</allow_inactive>
+ <allow_active>yes</allow_active>
+ </defaults>
+ </action>
+
</policyconfig>