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/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);
 #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 a6daf6287e2aa4e8494814d239c011eea81aa2c1..ba2167aabd071a62a7b6181fdd46b15672d52675 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -181,6 +181,7 @@ int MAIN(int argc, char **argv)
        unsigned long chtype = MBSTRING_ASC;
 #ifndef MONOLITH
        MS_STATIC char config_name[256];
        unsigned long chtype = MBSTRING_ASC;
 #ifndef MONOLITH
        MS_STATIC char config_name[256];

+       long errline;

 #endif
 
        req_conf = NULL;
 #endif
 
        req_conf = NULL;


@@ -529,7 +530,7 @@ bad:
                }
        default_config_file=p;
        config=NCONF_new(NULL);
                }
        default_config_file=p;
        config=NCONF_new(NULL);

-       i=NCONF_load(config, p);
+       i=NCONF_load(config, p, &errline);

 #endif
 
        if (template != NULL)
 #endif
 
        if (template != NULL)