From affd1b980aa03be038e2d4504ec8b0bad7ea253d Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 9 May 2019 13:53:28 +0200 Subject: [PATCH] BUILD: ssl: fix again a libressl build failure after the openssl FD leak fix As with every single OpenSSL fix, LibreSSL build broke again, this time after commit 56996dabe ("BUG/MINOR: mworker/ssl: close OpenSSL FDs on reload"). A definitive solution will have to be found quickly. For now, let's exclude libressl from the version test. This patch must be backported to 1.9 since the fix above was already backported there. --- src/haproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/haproxy.c b/src/haproxy.c index 4c371254e..30ccded61 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -590,7 +590,7 @@ void mworker_reload() ptdf->fct(); if (fdtab) deinit_pollers(); -#if defined(USE_OPENSSL) && (OPENSSL_VERSION_NUMBER >= 0x10101000L) +#if defined(USE_OPENSSL) && (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER) if (global.ssl_used_frontend || global.ssl_used_backend) /* close random device FDs */ RAND_keep_random_devices_open(0);