diff options
author | Bernhard Schmidt <berni@debian.org> | 2020-09-01 16:52:17 +0200 |
---|---|---|
committer | Bernhard Schmidt <berni@debian.org> | 2020-09-01 16:52:17 +0200 |
commit | 9fc3b98112217f2d92a67977dbde0987cc7a1803 (patch) | |
tree | 29fcc8654ee65d9dd89ade797bea2f3d9dfd9cfd /src/openvpn/lzo.c | |
parent | a8758c0e03eed188dcb9da0e4fd781a67c25bf1e (diff) | |
parent | 69b02b1f7fd609d84ace13ab04697158de2418a9 (diff) |
Merge branch 'debian/experimental-2.5'
Diffstat (limited to 'src/openvpn/lzo.c')
-rw-r--r-- | src/openvpn/lzo.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/openvpn/lzo.c b/src/openvpn/lzo.c index 8d9efea..d053fed 100644 --- a/src/openvpn/lzo.c +++ b/src/openvpn/lzo.c @@ -103,9 +103,11 @@ lzo_compress_init(struct compress_context *compctx) msg(D_INIT_MEDIUM, "LZO compression initializing"); ASSERT(!(compctx->flags & COMP_F_SWAP)); compctx->wu.lzo.wmem_size = LZO_WORKSPACE; - if (lzo_init() != LZO_E_OK) + + int lzo_status = lzo_init(); + if (lzo_status != LZO_E_OK) { - msg(M_FATAL, "Cannot initialize LZO compression library"); + msg(M_FATAL, "Cannot initialize LZO compression library (lzo_init() returns %d)", lzo_status); } compctx->wu.lzo.wmem = (lzo_voidp) lzo_malloc(compctx->wu.lzo.wmem_size); check_malloc_return(compctx->wu.lzo.wmem); @@ -121,7 +123,7 @@ lzo_compress_uninit(struct compress_context *compctx) static inline bool lzo_compression_enabled(struct compress_context *compctx) { - if (compctx->flags & COMP_F_ASYM) + if (!(compctx->flags & COMP_F_ALLOW_COMPRESS)) { return false; } |