From 291c227d2ccecaa92602eaa5259a23c7093e30e5 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Thu, 6 Aug 2015 13:17:15 +0200 Subject: Show extra-certs in current parameters, fix clang warning and logic error in preresolve Closes ticket #591 Acked-by: Gert Doering Message-Id: <1438859835-3977-1-git-send-email-arne@rfc2549.org> URL: http://article.gmane.org/gmane.network.openvpn.devel/10005 Signed-off-by: Gert Doering --- src/openvpn/options.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 9eb8e76..caf1394 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1582,6 +1582,7 @@ show_settings (const struct options *o) else #endif SHOW_STR (cert_file); + SHOW_STR (extra_certs_file); #ifdef MANAGMENT_EXTERNAL_KEY if((o->management_flags & MF_EXTERNAL_KEY)) @@ -4574,7 +4575,7 @@ add_option (struct options *options, else options->resolve_retry_seconds = positive_atoi (p[1]); } - else if (streq (p[0], "preresolve") || streq (p[0], "ip-remote-hint") && !p[2]) + else if ((streq (p[0], "preresolve") || streq (p[0], "ip-remote-hint")) && !p[2]) { VERIFY_PERMISSION (OPT_P_GENERAL); options->resolve_in_advance = true; -- cgit