提交 c821defc 编写于 作者: D Dr. Stephen Henson

Don't load same config file twice.

RT#4215
Reviewed-by: NRichard Levitte <levitte@openssl.org>
上级 727ee8cf
......@@ -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 */
......
......@@ -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) {
......
......@@ -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 */
......
......@@ -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. */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册