[Openvpn-devel] Fix compilation without compression

Message ID 20230324083816.79436-1-gert@greenie.muc.de
State Not Applicable
Headers show
Series [Openvpn-devel] Fix compilation without compression | expand

Commit Message

Gert Doering March 24, 2023, 8:38 a.m. UTC
The previous commit (e86bc8b2967) breaks compilation if all compression
algorithms are disabled (--disable-lz4 --disable-lzo).  A later patch
in the series would fix this but can not be merged yet.

Signed-off-by: Gert Doering <gert@greenie.muc.de>
---
 src/openvpn/options.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Gert Doering March 24, 2023, 12:46 p.m. UTC | #1
Hi,

On Fri, Mar 24, 2023 at 09:38:16AM +0100, Gert Doering wrote:
> The previous commit (e86bc8b2967) breaks compilation if all compression
> algorithms are disabled (--disable-lz4 --disable-lzo).  A later patch
> in the series would fix this but can not be merged yet.

Just for reference, this got fixed with Arne's commit a8170dd0e76 now,
so this patch is no longer needed.  Marked as such in Patchwork.

gert

Patch

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 435e1ca9..e3d14e94 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -3779,8 +3779,10 @@  options_postprocess_mutate(struct options *o, struct env_set *es)
     /* this depends on o->windows_driver, which is set above */
     options_postprocess_mutate_invariant(o);
 
+#ifdef USE_COMP
     /* check that compression settings in the options are okay */
     check_compression_settings_valid(&o->comp, M_USAGE);
+#endif
 
     /*
      * Save certain parms before modifying options during connect, especially