diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-08-26 14:26:12 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-08-26 14:26:12 -0500 |
| commit | 3945f75bda13961519f038be47b94f12e23cffc4 (patch) | |
| tree | 8f0b4fca68dcac2e0fe2bcc0fb36eeb494709281 /policy | |
| parent | 022d8e665ceffe2a167e0029619c2bd08ceb912e (diff) | |
| download | NetworkManager-3945f75bda13961519f038be47b94f12e23cffc4.tar.gz | |
core: consolidate all permissions checking into main D-Bus interface
Moves the system settings permissions checking into the core service's
permissions checking, which at the same time enables 3-way permission
reporting (yes, no, auth) instead of the old yes/no that we had for
system settings permissions before. This allows UI to show a lock
icon or such when the user could authenticate to gain the permission.
It also moves the wifi-create permissions' namespace to the main
namespace (not .settings) since they really should be checked before
starting a shared wifi connection, rather than having anything to do
with the settings service.
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/org.freedesktop.NetworkManager.policy.in | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/policy/org.freedesktop.NetworkManager.policy.in b/policy/org.freedesktop.NetworkManager.policy.in index 32b8ab00b9..af4b9a15b4 100644 --- a/policy/org.freedesktop.NetworkManager.policy.in +++ b/policy/org.freedesktop.NetworkManager.policy.in @@ -54,39 +54,39 @@ </defaults> </action> - <action id="org.freedesktop.NetworkManager.settings.modify"> - <_description>Modify system connections</_description> - <_message>System policy prevents modification of system settings</_message> + <action id="org.freedesktop.NetworkManager.wifi.share.protected"> + <_description>Connection sharing via a protected WiFi network</_description> + <_message>System policy prevents sharing connections via a protected WiFi network</_message> <defaults> <allow_inactive>no</allow_inactive> - <allow_active>auth_admin_keep</allow_active> + <allow_active>yes</allow_active> </defaults> </action> - <action id="org.freedesktop.NetworkManager.settings.hostname.modify"> - <_description>Modify persistent system hostname</_description> - <_message>System policy prevents modification of the persistent system hostname</_message> + <action id="org.freedesktop.NetworkManager.wifi.share.open"> + <_description>Connection sharing via an open WiFi network</_description> + <_message>System policy prevents sharing connections via an open WiFi network</_message> <defaults> <allow_inactive>no</allow_inactive> - <allow_active>auth_admin_keep</allow_active> + <allow_active>yes</allow_active> </defaults> </action> - <action id="org.freedesktop.NetworkManager.settings.wifi.share.protected"> - <_description>Connection sharing via a protected WiFi network</_description> - <_message>System policy prevents sharing connections via a protected WiFi network</_message> + <action id="org.freedesktop.NetworkManager.settings.modify"> + <_description>Modify system connections</_description> + <_message>System policy prevents modification of system settings</_message> <defaults> <allow_inactive>no</allow_inactive> - <allow_active>yes</allow_active> + <allow_active>auth_admin_keep</allow_active> </defaults> </action> - <action id="org.freedesktop.NetworkManager.settings.wifi.share.open"> - <_description>Connection sharing via an open WiFi network</_description> - <_message>System policy prevents sharing connections via an open WiFi network</_message> + <action id="org.freedesktop.NetworkManager.settings.hostname.modify"> + <_description>Modify persistent system hostname</_description> + <_message>System policy prevents modification of the persistent system hostname</_message> <defaults> <allow_inactive>no</allow_inactive> - <allow_active>yes</allow_active> + <allow_active>auth_admin_keep</allow_active> </defaults> </action> |