ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-01 19:46:51 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

openvpn: fix handling of list options

Browse Source 
This addresses an issue where the list option specified in
/etc/config/openvpn i.e. 'tls_cipher' would instead show up in the
generated openvpn-<name>.conf as 'ncp-ciphers'. For context,
'ncp_ciphers' appears after 'tls_cipher' in OPENVPN_LIST from
openvpn.options.

Also, the ordering of the options in the UCI config file is now
preserved when generating the OpenVPN config. The two currently
supported list options deal with cipher preferences.

Signed-off-by: Matt Merhar <mattmerhar@protonmail.com>
(cherry picked from commit 1d4c4cbd20)
This commit is contained in:
Matt Merhar 2019-06-22 03:05:14 -04:00 committed by Petr Štetiar
parent 0254087e92
commit c0a715f75e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/openvpn/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openvpn PKG_NAME:=openvpn
PKG_VERSION:=2.4.7 PKG_VERSION:=2.4.7
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_URL:=\ PKG_SOURCE_URL:=\
https://build.openvpn.net/downloads/releases/ \ https://build.openvpn.net/downloads/releases/ \

5
package/network/services/openvpn/files/openvpn.init
View File

@ -53,13 +53,14 @@ append_list() {
local p; local v; local s="$1"; shift local p; local v; local s="$1"; shift
list_cb_append() { list_cb_append() {
v="$1:${v}" v="${v}:$1"
} }
for p in $*; do for p in $*; do
unset v
config_list_foreach "$s" "$p" list_cb_append config_list_foreach "$s" "$p" list_cb_append
[ -n "$v" ] && append_param "$s" "$p" && echo " ${v:1}" >> "/var/etc/openvpn-$s.conf"
done done
[ -n "$v" ] && append_param "$s" "$p" && echo " ${v%*:}" >> "/var/etc/openvpn-$s.conf"
} }
section_enabled() { section_enabled() {