non-Monolith fixes.

Submitted by Andrew W. Gray <agray@iconsinc.com>

diff --git a/apps/apps.h b/apps/apps.h
index aad2862123f438060dab0c36db23f710b34365c0..24aa447117ea049acf1cd1701bde8000784d1b66 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -121,6 +121,7 @@
 #include <openssl/lhash.h>
 #include <openssl/conf.h>
 #include <openssl/txt_db.h>
+#include <openssl/engine.h>
 #include <openssl/ossl_typ.h>
 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);

diff --git a/apps/req.c b/apps/req.c
index 2ec2864005a0be2df4f8a0aebba704dad3a04d49..b986dae339b81a742c12a78e81bcc9e11f75edfe 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -177,6 +177,7 @@ int MAIN(int argc, char **argv)
        unsigned long chtype = MBSTRING_ASC;
 #ifndef MONOLITH
        MS_STATIC char config_name[256];
+       long errline;
 #endif
 
        req_conf = NULL;
@@ -472,7 +473,7 @@ bad:
                }
        default_config_file=p;
        config=NCONF_new(NULL);
-       i=NCONF_load(config, p);
+       i=NCONF_load(config, p, &errline);
 #endif
 
        if (template != NULL)

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 0592e6c2a8e467699161279fabff7c6f032d77f6..7d6b53eed143662cae68def08bde71912ff07ec4 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -111,7 +111,7 @@
 
 #define _XOPEN_SOURCE 600      /* Or gethostname won't be declared properly
                                   on Linux and GNU platforms. */
-#define _XOPEN_SOURCE_EXTENDED /* Or gethostname won't be declared properly
+#define _XOPEN_SOURCE_EXTENDED 1 /* Or gethostname won't be declared properly
                                   on Compaq platforms (at least with DEC C).
                                */