Refactor multi_client_connect_source_ccd(), so that options_server_import() (or
the success path in general) is only entered in one place within the function.
Signed-off-by: Fabian Knittel <fabian.knit...@lettink.de>
---
src/openvpn/multi.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 80bd5a3..8cc61d7 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -1732,7 +1732,19 @@ multi_client_connect_source_ccd (struct multi_context *m,
&gc);
/* try common-name file */
- if (test_file (ccd_file))
+ if (!test_file (ccd_file))
+ ccd_file = NULL;
+
+ if (!ccd_file)
+ {
+ ccd_file = gen_path (mi->context.options.client_config_dir,
+ CCD_DEFAULT, &gc);
+ /* try default file */
+ if (!test_file (ccd_file))
+ ccd_file = NULL;
+ }
+
+ if (ccd_file)
{
options_server_import (&mi->context.options,
ccd_file,
@@ -1740,22 +1752,7 @@ multi_client_connect_source_ccd (struct multi_context *m,
CLIENT_CONNECT_OPT_MASK,
option_types_found,
mi->context.c2.es);
- }
- else /* try default file */
- {
- ccd_file = gen_path (mi->context.options.client_config_dir,
- CCD_DEFAULT,
- &gc);
- if (test_file (ccd_file))
- {
- options_server_import (&mi->context.options,
- ccd_file,
- D_IMPORT_ERRORS|M_OPTERR,
- CLIENT_CONNECT_OPT_MASK,
- option_types_found,
- mi->context.c2.es);
- }
}
gc_free (&gc);
--
2.1.4
