Hi,
On Thu, Mar 23, 2023 at 06:06:00PM +0100, Arne Schwabe wrote:
> index 435e1ca9e..92f7456a4 100644
> --- a/src/openvpn/options.c
> +++ b/src/openvpn/options.c
> @@ -3644,10 +3644,16 @@ options_set_backwards_compatible_options(struct
> options *o)
> *
> * Disable compression by default starting with 2.6.0 if no other
> * compression related option has been explicitly set */
> - if (!comp_non_stub_enabled(&o->comp) && !need_compatibility_before(o,
> 20600)
> - && (o->comp.flags == 0))
> + if (!need_compatibility_before(o, 20600) && (o->comp.flags == 0))
> {
> - o->comp.flags = COMP_F_ALLOW_STUB_ONLY|COMP_F_ADVERTISE_STUBS_ONLY;
> + if (o->comp.alg == COMP_ALG_UNDEF)
> + {
> + o->comp.flags = COMP_F_ALLOW_NOCOMP_ONLY;
> + }
This breaks the scenario in question ("no compress in config, server pushes
'comp-lzo no'") unconditionally.
I thought we agreed that we only want to break this for "if DCO",
because this is what we *have* to break.
> @@ -3749,6 +3755,12 @@ options_postprocess_mutate(struct options *o, struct
> env_set *es)
> o->tuntap_options.disable_dco = !dco_check_option(D_DCO, o)
> || !dco_check_startup_option(D_DCO,
> o);
> }
> +#ifdef USE_COMP
> + if (dco_enabled(o))
> + {
> + o->comp.flags |= COMP_F_ALLOW_NOCOMP_ONLY;
> + }
> +#endif
... and that's the code for it.
So, NAK, some more hours wasted on testing.
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany g...@greenie.muc.de
signature.asc
Description: PGP signature
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
