diff options
| author | Daniel Gnoutcheff <daniel@gnoutcheff.name> | 2010-08-06 21:21:24 -0400 |
|---|---|---|
| committer | Daniel Gnoutcheff <daniel@gnoutcheff.name> | 2010-08-07 01:19:46 -0400 |
| commit | fb96309899a5ca853e206f52905df540719c7c5b (patch) | |
| tree | 78a1051cac64e1e507d03666d6a767c0a615d756 /src/NetworkManager.conf | |
| parent | 8b1cac703cfd1e21d3e85cc9cd9ab0837ffd3d67 (diff) | |
| download | NetworkManager-fb96309899a5ca853e206f52905df540719c7c5b.tar.gz | |
DBus: merge NetworkManger{,SystemSettings}
Remove the org.freedesktop.NetworkManagerSystemSettings bus name and
have everybody talk to org.freedesktop.NetworkManager. Now that we have
a single settings service that's embedded in the main daemon, we don't
need separate names anymore.
Diffstat (limited to 'src/NetworkManager.conf')
| -rw-r--r-- | src/NetworkManager.conf | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/NetworkManager.conf b/src/NetworkManager.conf index 8d08314002..8a581cb9be 100644 --- a/src/NetworkManager.conf +++ b/src/NetworkManager.conf @@ -4,10 +4,7 @@ <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"/> @@ -63,10 +60,17 @@ </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.NetworkManagerSettings"/> + + <allow send_destination="org.freedesktop.NetworkManager" + send_interface="org.freedesktop.NetworkManagerSettings.Connection"/> + + <allow send_destination="org.freedesktop.NetworkManager" + send_interface="org.freedesktop.NetworkManagerSettings.Secrets"/> <deny send_destination="org.freedesktop.NetworkManager" send_interface="org.freedesktop.NetworkManager" |