From: Andy Polyakov <appro@openssl.org>
Date: Wed, 21 Mar 2018 10:19:49 +0000 (+0100)
Subject: bio/bss_log.c: on DJGPP syslog facility is part of sockets library.
X-Git-Tag: OpenSSL_1_1_1-pre4~75
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d10ca7aed0028aeebbe8b91b3facd3dc2a5f42e7;p=oweals%2Fopenssl.git

bio/bss_log.c: on DJGPP syslog facility is part of sockets library.

In other words no-sock DJGPP build should suppress syslogging.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5708)
---

diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index b04f7bbfd3..10acba1dee 100644
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c
@@ -39,6 +39,8 @@ void *_malloc32(__size_t);
 #  endif                        /* __INITIAL_POINTER_SIZE == 64 */
 # endif                         /* __INITIAL_POINTER_SIZE && defined
                                  * _ANSI_C_SOURCE */
+#elif defined(__DJGPP__) && defined(OPENSSL_NO_SOCK)
+# define NO_SYSLOG
 #elif (!defined(MSDOS) || defined(WATT32)) && !defined(OPENSSL_SYS_VXWORKS) && !defined(NO_SYSLOG)
 # include <syslog.h>
 #endif