diff mbox

[OpenWrt-Devel,1/3] openvpn: fix handling comp_lzo and auth_retry as the wrong type.

Message ID 1434254688-16153-1-git-send-email-yszhou4tech@gmail.com
State Changes Requested
Headers show

Commit Message

Yousong Zhou June 14, 2015, 4:04 a.m. UTC
As reported in #19104.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
---
 package/network/services/openvpn/files/openvpn.init |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Felix Fietkau June 14, 2015, 1:35 p.m. UTC | #1
On 2015-06-14 06:04, Yousong Zhou wrote:
> As reported in #19104.
> 
> Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
comp-lzo does not seem to fit well in the "bool" category, it takes
"yes", "no", or "adaptive".
Also, please include the details of the changes that you make in the
patch description instead of just linking to the ticket.

- Felix
Yousong Zhou June 14, 2015, 2:41 p.m. UTC | #2
On 14 June 2015 at 21:35, Felix Fietkau <nbd@openwrt.org> wrote:
> On 2015-06-14 06:04, Yousong Zhou wrote:
>> As reported in #19104.
>>
>> Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
> comp-lzo does not seem to fit well in the "bool" category, it takes
> "yes", "no", or "adaptive".

Indeed, looks like the option changed between 2.0.x and 2.3.x

> Also, please include the details of the changes that you make in the
> patch description instead of just linking to the ticket.

Well, i thought the patches intention was quite clear and simple.  The
ticket number was included just for completeness.  Anyway, will do.
Thanks.

                yousong
diff mbox

Patch

diff --git a/package/network/services/openvpn/files/openvpn.init b/package/network/services/openvpn/files/openvpn.init
index 294e3ed..acdc7de 100644
--- a/package/network/services/openvpn/files/openvpn.init
+++ b/package/network/services/openvpn/files/openvpn.init
@@ -94,8 +94,8 @@  start_instance() {
 
 	# append flags
 	append_bools "$s" \
-		auth_nocache auth_retry auth_user_pass_optional bind ccd_exclusive client client_cert_not_required \
-		client_to_client comp_noadapt disable \
+		auth_nocache auth_user_pass_optional bind ccd_exclusive client client_cert_not_required \
+		client_to_client comp_lzo comp_noadapt disable \
 		disable_occ down_pre duplicate_cn fast_io float http_proxy_retry \
 		ifconfig_noexec ifconfig_nowarn ifconfig_pool_linear management_forget_disconnect management_hold \
 		management_query_passwords management_signal mktun mlock mtu_test multihome mute_replay_warnings \
@@ -107,8 +107,8 @@  start_instance() {
 
 	# append params
 	append_params "$s" \
-		cd askpass auth auth_user_pass auth_user_pass_verify bcast_buffers ca cert \
-		chroot cipher client_config_dir client_connect client_disconnect comp_lzo connect_freq \
+		cd askpass auth auth_retry auth_user_pass auth_user_pass_verify bcast_buffers ca cert \
+		chroot cipher client_config_dir client_connect client_disconnect connect_freq \
 		connect_retry connect_timeout connect_retry_max crl_verify dev dev_node dev_type dh \
 		echo engine explicit_exit_notify fragment group hand_window hash_size \
 		http_proxy http_proxy_option http_proxy_timeout ifconfig ifconfig_pool \