diff options
| author | Patrik Flykt <patrik.flykt@linux.intel.com> | 2014-04-01 16:49:44 +0300 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2014-04-02 14:03:20 +0300 |
| commit | 2b2a2733c1900097d4fe231cf0f64e9823e9e4a9 (patch) | |
| tree | 93468f7974c6e3b6215bd35f77d4c67873460f76 /Makefile.plugins | |
| parent | e3e7454ea718db8d1abe0b0806beab2aee951ca9 (diff) | |
| download | connman-2b2a2733c1900097d4fe231cf0f64e9823e9e4a9.tar.gz | |
vpn: Clean up STATEDIR usage
ConnMan creates a /var/run/connman state directory even though nothing
writes files there. ConnMan VPNd uses the directory for l2tp and ppp
configuration files. Fix this by removing the state directory creation
from ConnMan and modifying ConnMan VPNd to create a state directory
named /var/run/connman-vpn instead.
Thanks to Roman Kubiak for noticing this.
Diffstat (limited to 'Makefile.plugins')
| -rw-r--r-- | Makefile.plugins | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.plugins b/Makefile.plugins index cf0f9a82..294cae04 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -75,7 +75,7 @@ vpn_plugins_openconnect_la_SOURCES = vpn/plugins/vpn.h vpn/plugins/vpn.c \ vpn/plugins/openconnect.c vpn_plugins_openconnect_la_CFLAGS = $(plugin_cflags) \ -DOPENCONNECT=\"@OPENCONNECT@\" \ - -DSTATEDIR=\""$(statedir)"\" \ + -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" vpn_plugins_openconnect_la_LDFLAGS = $(plugin_ldflags) endif @@ -93,7 +93,7 @@ vpn_plugin_objects += $(plugins_openvpn_la_OBJECTS) vpn_plugins_openvpn_la_SOURCES = vpn/plugins/vpn.h vpn/plugins/vpn.c \ vpn/plugins/openvpn.c vpn_plugins_openvpn_la_CFLAGS = $(plugin_cflags) -DOPENVPN=\"@OPENVPN@\" \ - -DSTATEDIR=\""$(statedir)"\" \ + -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" vpn_plugins_openvpn_la_LDFLAGS = $(plugin_ldflags) endif @@ -111,7 +111,7 @@ vpn_plugin_objects += $(plugins_vpnc_la_OBJECTS) vpn_plugins_vpnc_la_SOURCES = vpn/plugins/vpn.h vpn/plugins/vpn.c \ vpn/plugins/vpnc.c vpn_plugins_vpnc_la_CFLAGS = $(plugin_cflags) -DVPNC=\"@VPNC@\" \ - -DSTATEDIR=\""$(statedir)"\" \ + -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" vpn_plugins_vpnc_la_LDFLAGS = $(plugin_ldflags) endif @@ -129,7 +129,7 @@ vpn_plugin_objects += $(plugins_l2tp_la_OBJECTS) vpn_plugins_l2tp_la_SOURCES = vpn/plugins/vpn.h vpn/plugins/vpn.c \ vpn/plugins/l2tp.c vpn_plugins_l2tp_la_CFLAGS = $(plugin_cflags) -DL2TP=\"@L2TP@\" \ - -DSTATEDIR=\""$(statedir)"\" \ + -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" vpn_plugins_l2tp_la_LDFLAGS = $(plugin_ldflags) endif @@ -148,7 +148,7 @@ vpn_plugins_pptp_la_SOURCES = vpn/plugins/vpn.h vpn/plugins/vpn.c \ vpn/plugins/pptp.c vpn_plugins_pptp_la_CFLAGS = $(plugin_cflags) -DPPPD=\"@PPPD@\" \ -DPPTP=\"@PPTP@\" \ - -DSTATEDIR=\""$(statedir)"\" \ + -DVPN_STATEDIR=\""$(vpn_statedir)"\" \ -DSCRIPTDIR=\""$(build_scriptdir)"\" vpn_plugins_pptp_la_LDFLAGS = $(plugin_ldflags) endif |