[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  c821defc3f728a491856b7286e5b2cbda96a3563 (commit)
      from  727ee8cfeb2893d5aec4a6e571e9adf0667e9135 (commit)


- Log -----------------------------------------------------------------
commit c821defc3f728a491856b7286e5b2cbda96a3563
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sun May 15 18:43:03 2016 +0100

    Don't load same config file twice.
    
    RT#4215
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 apps/ca.c  | 2 +-
 apps/req.c | 2 +-
 apps/srp.c | 2 +-
 apps/ts.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/ca.c b/apps/ca.c
index 880e0b9..ac71e08 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -479,7 +479,7 @@ end_of_options:
 
     if ((conf = app_load_config(configfile)) == NULL)
         goto end;
-    if (!app_load_modules(conf))
+    if (configfile != default_config_file && !app_load_modules(conf))
         goto end;
 
     /* Lets get the config section we are using */
diff --git a/apps/req.c b/apps/req.c
index 7f4a946..cd51c18 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -386,7 +386,7 @@ int req_main(int argc, char **argv)
     if (verbose)
         BIO_printf(bio_err, "Using configuration from %s\n", template);
     req_conf = app_load_config(template);
-    if (!app_load_modules(req_conf))
+    if (template != default_config_file && !app_load_modules(req_conf))
         goto end;
 
     if (req_conf != NULL) {
diff --git a/apps/srp.c b/apps/srp.c
index 48ef85d..14f837f 100644
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -359,7 +359,7 @@ int srp_main(int argc, char **argv)
         conf = app_load_config(configfile);
         if (conf == NULL)
             goto end;
-        if (!app_load_modules(conf))
+        if (configfile != default_config_file && !app_load_modules(conf))
             goto end;
 
         /* Lets get the config section we are using */
diff --git a/apps/ts.c b/apps/ts.c
index d55d239..8a7b5ed 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -339,7 +339,7 @@ int ts_main(int argc, char **argv)
     }
 
     conf = load_config_file(configfile);
-    if (!app_load_modules(conf))
+    if (configfile != default_config_file && !app_load_modules(conf))
         goto end;
 
     /* Check parameter consistency and execute the appropriate function. */