diff options
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/Makefile.am | 1 | ||||
| -rw-r--r-- | policy/org.freedesktop.NetworkManager.policy.in | 36 | ||||
| -rw-r--r-- | policy/org.freedesktop.network-manager-settings.system.policy.in | 48 |
3 files changed, 36 insertions, 49 deletions
diff --git a/policy/Makefile.am b/policy/Makefile.am index 4778ce230a..289d220bdb 100644 --- a/policy/Makefile.am +++ b/policy/Makefile.am @@ -1,7 +1,6 @@ polkit_policydir = $(datadir)/polkit-1/actions dist_polkit_policy_in_files = \ - org.freedesktop.network-manager-settings.system.policy.in \ org.freedesktop.NetworkManager.policy.in dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy) diff --git a/policy/org.freedesktop.NetworkManager.policy.in b/policy/org.freedesktop.NetworkManager.policy.in index 67af7838a9..32b8ab00b9 100644 --- a/policy/org.freedesktop.NetworkManager.policy.in +++ b/policy/org.freedesktop.NetworkManager.policy.in @@ -54,5 +54,41 @@ </defaults> </action> + <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>auth_admin_keep</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> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep</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> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>yes</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> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>yes</allow_active> + </defaults> + </action> + </policyconfig> diff --git a/policy/org.freedesktop.network-manager-settings.system.policy.in b/policy/org.freedesktop.network-manager-settings.system.policy.in deleted file mode 100644 index 620e3a6a58..0000000000 --- a/policy/org.freedesktop.network-manager-settings.system.policy.in +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> - -<policyconfig> - - <vendor>NetworkManager</vendor> - <vendor_url>http://www.gnome.org/projects/NetworkManager</vendor_url> - <icon_name>nm-icon</icon_name> - - <action id="org.freedesktop.network-manager-settings.system.modify"> - <_description>Modify system connections</_description> - <_message>System policy prevents modification of system settings</_message> - <defaults> - <allow_inactive>no</allow_inactive> - <allow_active>auth_admin_keep</allow_active> - </defaults> - </action> - - <action id="org.freedesktop.network-manager-settings.system.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>auth_admin_keep</allow_active> - </defaults> - </action> - - <action id="org.freedesktop.network-manager-settings.system.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>yes</allow_active> - </defaults> - </action> - - <action id="org.freedesktop.network-manager-settings.system.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>yes</allow_active> - </defaults> - </action> - -</policyconfig> |