1
0
mirror of https://github.com/gryf/wicd.git synced 2026-04-17 03:03:34 +02:00

Merged mainline back into this branch

This reverts my previous change to the dbus config file, and adds a
    minor documentation bug to it.  I'll fix that in the next commit.
This commit is contained in:
Robby Workman
2009-07-08 01:35:17 -05:00

View File

@@ -17,20 +17,14 @@
<deny own="org.wicd.daemon"/> <deny own="org.wicd.daemon"/>
</policy> </policy>
<!-- This Unix group will have permission to use Wicd's gui --> <!-- Comment the block below if you do not want all users logged in
<policy group="%WICDGROUP%"> locally to have permission to use wicd-client. This ignores the
<allow send_interface="org.freedesktop.DBus.Introspectable"/> group based permission model defined above for the "%WICDGROUP%"
<allow send_destination="org.wicd.daemon"/> group. Note that this only applies if you are using ConsoleKit -
<allow send_interface="org.wicd.daemon"/> if you do not have ConsoleKit installed and in use, then this
</policy> block makes no difference either way. -->
<!-- Uncomment the block below if you want all users logged in locally <policy at_console="true">
to have permission to use wicd-client. This ignores the group
based permission model defined above for the "%WICDGROUP%" group.
Note that this only applies if you are using ConsoleKit - if you
do not have ConsoleKit installed and in use, then this block makes
no difference either way. -->
<!-- <policy at_console="true">
<allow send_destination="org.wicd.daemon"/> <allow send_destination="org.wicd.daemon"/>
<allow send_interface="org.wicd.daemon"/> <allow send_interface="org.wicd.daemon"/>
<allow send_destination="org.wicd.daemon.wireless"/> <allow send_destination="org.wicd.daemon.wireless"/>
@@ -38,6 +32,13 @@
<allow send_destination="org.wicd.daemon.wired"/> <allow send_destination="org.wicd.daemon.wired"/>
<allow send_interface="org.wicd.daemon.wired"/> <allow send_interface="org.wicd.daemon.wired"/>
<allow send_interface="org.freedesktop.DBus.Introspectable"/> <allow send_interface="org.freedesktop.DBus.Introspectable"/>
</policy> --> </policy>
<!-- This Unix group will have permission to use Wicd's gui -->
<policy group="%WICDGROUP%">
<allow send_interface="org.freedesktop.DBus.Introspectable"/>
<allow send_destination="org.wicd.daemon"/>
<allow send_interface="org.wicd.daemon"/>
</policy>
</busconfig> </busconfig>