upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-04-21 22:27:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Show extra-certs in current parameters, fix clang warning and logic error in preresolve

Browse source 
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>
This commit is contained in:
Arne Schwabe 2015-08-06 13:17:15 +02:00 committed by Gert Doering
parent 0ffd744332
commit 291c227d2c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/openvpn/options.c
View file

@ -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;