[Openvpn-devel,v1] check_compression_settings_valid: Do not test for LZ4 in LZO check

Message ID 20240216123037.3670448-1-frank@lichtenheld.com
State Accepted
Headers show
Series [Openvpn-devel,v1] check_compression_settings_valid: Do not test for LZ4 in LZO check | expand

Commit Message

Frank Lichtenheld Feb. 16, 2024, 12:30 p.m. UTC
Probably introduced by copy & paste since there is no
COMP_ALGV2_LZO.

Github: #500
Change-Id: Id6b038c1c0095b2f22033e9dc7090e2507a373ab
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master and release/2.6.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/526
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Arne Schwabe <arne-openvpn@rfc2549.org>

Comments

Gert Doering March 8, 2024, 11:25 a.m. UTC | #1
"Makes sense" :-)

Your patch has been applied to the master and release/2.6 branch (bugfix).

commit 4076d24f2f4adc432753aa62bd8158e3bf89ee21 (master)
commit 7a810e64e54eda264c9cf184f442a3bae8df66af (release/2.6)
Author: Frank Lichtenheld
Date:   Fri Feb 16 13:30:37 2024 +0100

     check_compression_settings_valid: Do not test for LZ4 in LZO check

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
     Message-Id: <20240216123037.3670448-1-frank@lichtenheld.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28251.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/comp.c b/src/openvpn/comp.c
index 6e30369..311f3e9 100644
--- a/src/openvpn/comp.c
+++ b/src/openvpn/comp.c
@@ -195,7 +195,7 @@ 
     }
 #endif
 #ifndef ENABLE_LZO
-    if (info->alg == COMP_ALG_LZO || info->alg == COMP_ALG_LZ4)
+    if (info->alg == COMP_ALG_LZO)
     {
         msg(msglevel, "OpenVPN is compiled without LZO support. Requested "
             "compression cannot be enabled.");