Commit 264c8188 authored by Jussi Laakkonen's avatar Jussi Laakkonen

vpn: Rename openconnect-script to vpn-script

The scripts/openconnect-script.c has nothing OpenConnect specific and is
also used by VPNC. Thus, renaming it to generic vpn-script.c clarifies
the purpose of the script.

Changed OpenConnect and VPNC plugins to use vpn-script. Modified
Makefile.plugins also to use the vpn-script..
parent c6109286
......@@ -41,7 +41,7 @@ src/connman-wait-online.service
src/connmand-wait-online
plugins/connman.policy
scripts/connman
scripts/openconnect-script
scripts/vpn-script
scripts/openvpn-script
scripts/connman_resolvconf.conf
client/connmanctl
......
......@@ -230,14 +230,14 @@ plugins_iospm_la_LDFLAGS = $(plugin_ldflags)
endif
if OPENCONNECT
script_PROGRAMS += scripts/openconnect-script
script_PROGRAMS += scripts/vpn-script
scripts_openconnect_script_LDADD = @DBUS_LIBS@
scripts_vpn_script_LDADD = @DBUS_LIBS@
else
if VPNC
script_PROGRAMS += scripts/openconnect-script
script_PROGRAMS += scripts/vpn-script
scripts_openconnect_script_LDADD = @DBUS_LIBS@
scripts_vpn_script_LDADD = @DBUS_LIBS@
endif
endif
......
......@@ -54,9 +54,11 @@ static void append(DBusMessageIter *dict, const char *pattern)
key = pattern;
value = delim + 1;
/* We clean the environment before invoking openconnect, but
might as well still filter out the few things that get
added that we're not interested in */
/*
* We clean the environment before invoking openconnect/vpnc,
* but might as well still filter out the few things that get
* added that we're not interested in
*/
if (!strcmp(key, "PWD") || !strcmp(key, "_") ||
!strcmp(key, "SHLVL") || !strcmp(key, "connman_busname") ||
!strcmp(key, "connman_network"))
......
......@@ -248,8 +248,7 @@ static int run_connect(struct vpn_provider *provider,
connman_task_add_argument(task, "--syslog", NULL);
connman_task_add_argument(task, "--cookie-on-stdin", NULL);
connman_task_add_argument(task, "--script",
SCRIPTDIR "/openconnect-script");
connman_task_add_argument(task, "--script", SCRIPTDIR "/vpn-script");
connman_task_add_argument(task, "--interface", if_name);
......
......@@ -298,8 +298,7 @@ static int vc_connect(struct vpn_provider *provider,
connman_task_add_argument(task, "--ifmode", "tun");
}
connman_task_add_argument(task, "--script",
SCRIPTDIR "/openconnect-script");
connman_task_add_argument(task, "--script", SCRIPTDIR "/vpn-script");
option = vpn_provider_get_string(provider, "VPNC.Debug");
if (option)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment