nm: Move the D-Bus policy to charon-nm

It's needed for useful use of charon-nm, unlike the GUI.
This commit is contained in:
Lubomir Rintel
2016-09-05 15:28:53 +02:00
committed by Tobias Brunner
parent 6a0382e1f2
commit 916cd5d7ca
3 changed files with 5 additions and 5 deletions
+2 -5
View File
@@ -2,9 +2,6 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = properties auth-dialog po
dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-strongswan-service.conf
nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservice_DATA = nm-strongswan-service.name
@@ -20,8 +17,8 @@ nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' \
-e 's|[@]CHARON[@]|$(charon)|' $< >$@
EXTRA_DIST = nm-strongswan-service.name.in \
$(dbusservice_DATA) \
EXTRA_DIST = \
nm-strongswan-service.name.in \
$(appdata_in_files) \
$(appdata_DATA) \
intltool-extract.in \
@@ -1,16 +0,0 @@
<!DOCTYPE busconfig PUBLIC
"-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig>
<policy user="root">
<allow own="org.freedesktop.NetworkManager.strongswan"/>
<allow send_destination="org.freedesktop.NetworkManager.strongswan"/>
<allow send_interface="org.freedesktop.NetworkManager.strongswan"/>
</policy>
<policy context="default">
<deny own="org.freedesktop.NetworkManager.strongswan"/>
<deny send_destination="org.freedesktop.NetworkManager.strongswan"/>
<deny send_interface="org.freedesktop.NetworkManager.strongswan"/>
</policy>
</busconfig>