diff options
author | Dan Williams <dcbw@redhat.com> | 2011-01-12 15:46:37 -0600 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2011-01-12 15:46:37 -0600 |
commit | f9ceafd4a124142617280101eda5464ac67c5e39 (patch) | |
tree | cd336e771bf30ba1ee0347037a7f47095fc04c58 /policy | |
parent | 7de13fa58dca796493b623fcba00d468f3aaa9f6 (diff) | |
parent | 5a35862a1d24fb8d515ea09339123646370c2845 (diff) | |
download | NetworkManager-f9ceafd4a124142617280101eda5464ac67c5e39.tar.gz |
Merge remote branch 'origin/master' into rm-userset
Diffstat (limited to 'policy')
-rw-r--r-- | policy/org.freedesktop.NetworkManager.policy.in | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/policy/org.freedesktop.NetworkManager.policy.in b/policy/org.freedesktop.NetworkManager.policy.in index af4b9a15b4..acdee8829c 100644 --- a/policy/org.freedesktop.NetworkManager.policy.in +++ b/policy/org.freedesktop.NetworkManager.policy.in @@ -45,6 +45,15 @@ </defaults> </action> + <action id="org.freedesktop.NetworkManager.enable-disable-wimax"> + <_description>Enable or disable WiMAX mobile broadband devices</_description> + <_message>System policy prevents enabling or disabling WiMAX mobile broadband devices</_message> + <defaults> + <allow_inactive>no</allow_inactive> + <allow_active>yes</allow_active> + </defaults> + </action> + <action id="org.freedesktop.NetworkManager.network-control"> <_description>Allow control of network connections</_description> <_message>System policy prevents control of network connections</_message> |