From: Willy Tarreau <w@1wt.eu>
Date: Thu, 9 May 2019 11:53:28 +0000 (+0200)
Subject: BUILD: ssl: fix again a libressl build failure after the openssl FD leak fix
X-Git-Tag: v2.0-dev3~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=affd1b980aa03be038e2d4504ec8b0bad7ea253d;p=thirdparty%2Fhaproxy.git

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.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 4c371254e1..30ccded61c 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);