Remove use-user-connections polkit action

diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index 7de1b68..8ff15b3 100644 (file)
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -293,7 +293,6 @@ register_for_property_changed (NMClient *client)
 #define NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK "org.freedesktop.NetworkManager.enable-disable-network"
 #define NM_AUTH_PERMISSION_ENABLE_DISABLE_WIFI    "org.freedesktop.NetworkManager.enable-disable-wifi"
 #define NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN    "org.freedesktop.NetworkManager.enable-disable-wwan"
-#define NM_AUTH_PERMISSION_USE_USER_CONNECTIONS   "org.freedesktop.NetworkManager.use-user-connections"
 
 static NMClientPermission
 nm_permission_to_client (const char *nm)
@@ -304,8 +303,6 @@ nm_permission_to_client (const char *nm)
                return NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI;
        else if (!strcmp (nm, NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN))
                return NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN;
-       else if (!strcmp (nm, NM_AUTH_PERMISSION_USE_USER_CONNECTIONS))
-               return NM_CLIENT_PERMISSION_USE_USER_CONNECTIONS;
        return NM_CLIENT_PERMISSION_NONE;
 }
 

diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h
index 206c555..e863161 100644 (file)
--- a/libnm-glib/nm-client.h
+++ b/libnm-glib/nm-client.h
@@ -56,9 +56,8 @@ typedef enum {
        NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK = 1,
        NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI = 2,
        NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN = 3,
-       NM_CLIENT_PERMISSION_USE_USER_CONNECTIONS = 4,
 
-       NM_CLIENT_PERMISSION_LAST = NM_CLIENT_PERMISSION_USE_USER_CONNECTIONS
+       NM_CLIENT_PERMISSION_LAST = NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN
 } NMClientPermission;
 
 typedef enum {

diff --git a/policy/org.freedesktop.NetworkManager.policy.in b/policy/org.freedesktop.NetworkManager.policy.in
index 3e7db05..67af783 100644 (file)
--- a/policy/org.freedesktop.NetworkManager.policy.in
+++ b/policy/org.freedesktop.NetworkManager.policy.in
@@ -45,15 +45,6 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.NetworkManager.use-user-connections">
-    <_description>Allow use of user-specific connections</_description>
-    <_message>System policy prevents use of user-specific connections</_message>
-    <defaults>
-      <allow_inactive>yes</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>

diff --git a/src/nm-manager-auth.h b/src/nm-manager-auth.h
index 6eedb28..e944d20 100644 (file)
--- a/src/nm-manager-auth.h
+++ b/src/nm-manager-auth.h
@@ -31,7 +31,6 @@
 #define NM_AUTH_PERMISSION_SLEEP_WAKE             "org.freedesktop.NetworkManager.sleep-wake"
 #define NM_AUTH_PERMISSION_ENABLE_DISABLE_WIFI    "org.freedesktop.NetworkManager.enable-disable-wifi"
 #define NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN    "org.freedesktop.NetworkManager.enable-disable-wwan"
-#define NM_AUTH_PERMISSION_USE_USER_CONNECTIONS   "org.freedesktop.NetworkManager.use-user-connections"
 #define NM_AUTH_PERMISSION_NETWORK_CONTROL        "org.freedesktop.NetworkManager.network-control"
 
 

diff --git a/src/nm-manager.c b/src/nm-manager.c
index 865529c..f17389c 100644 (file)
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -2716,7 +2716,6 @@ get_permissions_done_cb (NMAuthChain *chain,
                get_perm_add_result (chain, results, NM_AUTH_PERMISSION_SLEEP_WAKE);
                get_perm_add_result (chain, results, NM_AUTH_PERMISSION_ENABLE_DISABLE_WIFI);
                get_perm_add_result (chain, results, NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN);
-               get_perm_add_result (chain, results, NM_AUTH_PERMISSION_USE_USER_CONNECTIONS);
                get_perm_add_result (chain, results, NM_AUTH_PERMISSION_NETWORK_CONTROL);
                dbus_g_method_return (context, results);
                g_hash_table_destroy (results);
@@ -2743,7 +2742,6 @@ impl_manager_get_permissions (NMManager *self,
        nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_SLEEP_WAKE, FALSE);
        nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_ENABLE_DISABLE_WIFI, FALSE);
        nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN, FALSE);
-       nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_USE_USER_CONNECTIONS, FALSE);
        nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, FALSE);
 }