From: Max Fillinger Date: Thu, 21 Oct 2021 11:50:37 +0000 (+0200) Subject: Fix build with compression disabled X-Git-Tag: v2.6_beta1~409 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bc3375f1fff09d21f224eb9f8f9c3943ed4f404;p=thirdparty%2Fopenvpn.git Fix build with compression disabled When building with both --disable-lz4 and --disable-lzo, the function comp_non_stub_enabled and various flags are not defined. One of the places where it is used in options.c was not put behind an #ifdef, which caused compilation to fail. Trac: #1435 Signed-off-by: Max Fillinger Acked-by: Gert Doering Message-Id: <20211021115037.27056-1-maximilian.fillinger@foxcrypto.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg23035.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/options.c b/src/openvpn/options.c index ed2dcd53d..4a5db8a6d 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3205,6 +3205,7 @@ options_set_backwards_compatible_options(struct options *o) o->enable_ncp_fallback = true; } +#ifdef USE_COMP /* Compression is deprecated and we do not want to announce support for it * by default anymore, additionally DCO breaks with compression. * @@ -3215,6 +3216,7 @@ options_set_backwards_compatible_options(struct options *o) { o->comp.flags = COMP_F_ALLOW_STUB_ONLY|COMP_F_ADVERTISE_STUBS_ONLY; } +#endif } static void