Commit c821defc authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Don't load same config file twice. 



RT#4215

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 727ee8cf

apps/ca.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

apps/req.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

apps/srp.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

apps/ts.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */