diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-07-21 18:59:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 18:59:00 -0700 |
| commit | 75efd85bf193de52cb5f5ff9bd1014dad93a7c6f (patch) | |
| tree | a3e67ae80352e608d0c994ba405f6d16295418aa /net/openfortivpn | |
| parent | 46da3eedc5d15b8c395d0ed939ee7898db331e48 (diff) | |
| parent | f32ad358707b7b2880dae390f3ce98decf12ea85 (diff) | |
Merge pull request #12799 from aaronjg/openfortivpn/netifd
openfortivpn: use standard 'peerdns' config option on netifd script
Diffstat (limited to 'net/openfortivpn')
| -rw-r--r-- | net/openfortivpn/Makefile | 2 | ||||
| -rwxr-xr-x | net/openfortivpn/files/openfortivpn.sh | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/net/openfortivpn/Makefile b/net/openfortivpn/Makefile index 2ebd79a34..b07672cca 100644 --- a/net/openfortivpn/Makefile +++ b/net/openfortivpn/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openfortivpn PKG_VERSION:=1.14.1 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/adrienverge/openfortivpn/tar.gz/v$(PKG_VERSION)? diff --git a/net/openfortivpn/files/openfortivpn.sh b/net/openfortivpn/files/openfortivpn.sh index 7ccfd7628..7ddbc7b75 100755 --- a/net/openfortivpn/files/openfortivpn.sh +++ b/net/openfortivpn/files/openfortivpn.sh @@ -19,8 +19,6 @@ proto_openfortivpn_init_config() { proto_config_add_string "password" proto_config_add_string "trusted_cert" proto_config_add_string "remote_status_check" - proto_config_add_int "set_dns" - proto_config_add_int "pppd_use_peerdns" proto_config_add_int "peerdns" proto_config_add_int "metric" no_device=1 @@ -32,7 +30,7 @@ proto_openfortivpn_setup() { local msg json_get_vars host server port iface_name local_ip username password trusted_cert \ - remote_status_check set_dns pppd_use_peerdns metric + remote_status_check peerdns metric ifname="vpn-$config" @@ -91,11 +89,12 @@ proto_openfortivpn_setup() { [ -n "$port" ] && port=":$port" + [ -z "$peerdns" ] && peerdns=1 append_args "$server$port" --pppd-ifname="$ifname" --use-syslog -c /dev/null - append_args "--set-dns=$set_dns" + append_args "--set-dns=0" append_args "--no-routes" - append_args "--pppd-use-peerdns=$pppd_use_peerdns" + append_args "--pppd-use-peerdns=$peerdns" [ -n "$iface_name" ] && { append_args "--ifname=$iface_device_name" |