[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  ca811248d838058c13236a6c3b688e0ac98c02c8 (commit)
      from  6e68f244f48bd7118b9262ff5905da1c3b15cae9 (commit)


- Log -----------------------------------------------------------------
commit ca811248d838058c13236a6c3b688e0ac98c02c8
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Nov 12 18:16:27 2018 +0100

    apps/ocsp.c Use the same HAVE_FORK / NO_FORK as in speed.c
    
    This allows the user to override our defaults if needed, and in a
    consistent manner.
    
    Partial fix for #7607
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7624)

-----------------------------------------------------------------------

Summary of changes:
 apps/ocsp.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 7c2a904..09eeb9c 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -36,7 +36,21 @@ NON_EMPTY_TRANSLATION_UNIT
 # include <openssl/x509v3.h>
 # include <openssl/rand.h>
 
-# if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_NO_SOCK) \
+#ifndef HAVE_FORK
+# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS)
+#  define HAVE_FORK 0
+# else
+#  define HAVE_FORK 1
+# endif
+#endif
+
+#if HAVE_FORK
+# undef NO_FORK
+#else
+# define NO_FORK
+#endif
+
+# if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \
      && !defined(OPENSSL_NO_POSIX_IO)
 #  define OCSP_DAEMON
 #  include <sys/types.h>