diff options
| author | Michael Biebl <biebl@debian.org> | 2011-04-08 07:31:15 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-04-08 07:31:15 +0200 |
| commit | 9f612fa9c09bbdc00071d871316da870c6bf0023 (patch) | |
| tree | 9c1be60eceefb3b069df4d2780f9c14967a62edc /src/NetworkManager.conf | |
| parent | af468d82c62191b070d569257eb2f2ac61da98cc (diff) | |
| parent | f75dd6fd1975146623052b843b182dc32c3fbe46 (diff) | |
Merge commit 'upstream/0.8.998' into experimental
Diffstat (limited to 'src/NetworkManager.conf')
| -rw-r--r-- | src/NetworkManager.conf | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/NetworkManager.conf b/src/NetworkManager.conf index 1f1ed49b..b256a444 100644 --- a/src/NetworkManager.conf +++ b/src/NetworkManager.conf @@ -4,13 +4,12 @@ <busconfig> <policy user="root"> <allow own="org.freedesktop.NetworkManager"/> - <allow own="org.freedesktop.NetworkManagerSystemSettings"/> - <allow send_destination="org.freedesktop.NetworkManager"/> - <allow send_destination="org.freedesktop.NetworkManagerSystemSettings"/> <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.PPP"/> + + <allow send_interface="org.freedesktop.NetworkManager.SecretAgent"/> </policy> <policy at_console="true"> <allow send_destination="org.freedesktop.NetworkManager"/> @@ -57,6 +56,9 @@ <allow send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager.VPN.Connection"/> + <allow send_destination="org.freedesktop.NetworkManager" + send_interface="org.freedesktop.NetworkManager.AgentManager"/> + <deny send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager" send_member="SetLogging"/> @@ -75,10 +77,14 @@ </policy> <policy context="default"> <deny own="org.freedesktop.NetworkManager"/> - <deny own="org.freedesktop.NetworkManagerSystemSettings"/> <deny send_destination="org.freedesktop.NetworkManager"/> - <allow send_destination="org.freedesktop.NetworkManagerSystemSettings"/> + + <allow send_destination="org.freedesktop.NetworkManager" + send_interface="org.freedesktop.NetworkManager.Settings"/> + + <allow send_destination="org.freedesktop.NetworkManager" + send_interface="org.freedesktop.NetworkManager.AgentManager"/> <deny send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager" @@ -95,10 +101,6 @@ <deny send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager" send_member="wake"/> - - <!-- The org.freedesktop.NetworkManagerSettings.Connection.Secrets - interface is secured via PolicyKit. - --> </policy> <limit name="max_replies_per_connection">512</limit> |