diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2015-08-06 13:17:15 +0200 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2015-08-08 14:55:00 +0200 |
| commit | 291c227d2ccecaa92602eaa5259a23c7093e30e5 (patch) | |
| tree | b1400fa628d46f796f9fef8a9220b08f923b384b /src/openvpn/options.c | |
| parent | 0ffd744332f51878c4df430ab14aca3126bdfc8a (diff) | |
| download | openvpn-291c227d2ccecaa92602eaa5259a23c7093e30e5.tar.gz openvpn-291c227d2ccecaa92602eaa5259a23c7093e30e5.tar.xz openvpn-291c227d2ccecaa92602eaa5259a23c7093e30e5.zip | |
Show extra-certs in current parameters, fix clang warning and logic error in preresolve
Closes ticket #591
Acked-by: Gert Doering <gert@greenie.muc.de>
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 <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/options.c')
| -rw-r--r-- | src/openvpn/options.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |