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

Closes ticket #591

---
 src/openvpn/options.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

index 737d9a2..8a9d2d1 100644
@@ -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))

@@ -4575,7 +4576,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;

2.3.2 (Apple Git-55)

ACK.

Your patch has been applied to the master and release/2.3 branch (release/2.3 only gets the - trivial - SHOW_STR() chunk, the bugfix for --preresolve does not apply and isn't needed anyway)

commit 291c227d2ccecaa92602eaa5259a23c7093e30e5 (master) commit d7ab314c57a0b851e0e714c903c2bc5ececac3ae (release/2.3)

Author: Arne Schwabe
Date:   Thu Aug 6 13:17:15 2015 +0200

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

     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/10005
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering