Fixed compile issues on Windows.

Version 2.1.3w

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7219 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/init.c b/init.c
index b1f65a9774db55486c1dca41aeb5d972c378e7a9..e5ca358edf6b8f83fd62e8d9679cf6907cae03f1 100644 (file)
--- a/init.c
+++ b/init.c
@@ -2056,6 +2056,7 @@ do_init_crypto_tls (struct context *c, const unsigned int flags)
   to.verify_command = options->tls_verify;
   to.verify_x509name = options->tls_remote;
   to.crl_file = options->crl_file;
+  to.ssl_flags = options->ssl_flags;
   to.ns_cert_type = options->ns_cert_type;
   memmove (to.remote_cert_ku, options->remote_cert_ku, sizeof (to.remote_cert_ku));
   to.remote_cert_eku = options->remote_cert_eku;
@@ -2076,7 +2077,6 @@ do_init_crypto_tls (struct context *c, const unsigned int flags)
   to.auth_user_pass_verify_script = options->auth_user_pass_verify_script;
   to.auth_user_pass_verify_script_via_file = options->auth_user_pass_verify_script_via_file;
   to.tmp_dir = options->tmp_dir;
-  to.ssl_flags = options->ssl_flags;
   if (options->ccd_exclusive)
     to.client_config_dir_exclusive = options->client_config_dir;
 #endif

diff --git a/options.c b/options.c
index 1cfccd3fea3635174759398e651151798ab13c69..df7546ce65644b07cd0a8aa4865888e4e984ac73 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1055,7 +1055,6 @@ show_p2mp_parms (const struct options *o)
   SHOW_INT (max_routes_per_client);
   SHOW_STR (auth_user_pass_verify_script);
   SHOW_BOOL (auth_user_pass_verify_script_via_file);
-  SHOW_INT (ssl_flags);
 #if PORT_SHARE
   SHOW_STR (port_share_host);
   SHOW_INT (port_share_port);
@@ -1405,6 +1404,7 @@ show_settings (const struct options *o)
       SHOW_INT (remote_cert_ku[i]);
   }
   SHOW_STR (remote_cert_eku);
+  SHOW_INT (ssl_flags);
 
   SHOW_INT (tls_timeout);
 

diff --git a/options.h b/options.h
index f0baabe0896dc72b7a78cf96814a2eca4c5b12bb..91ec6dceadf780cd8b36ca99f432855d5ec4e218 100644 (file)
--- a/options.h
+++ b/options.h
@@ -426,7 +426,6 @@ struct options
 
   const char *auth_user_pass_verify_script;
   bool auth_user_pass_verify_script_via_file;
-  unsigned int ssl_flags; /* set to SSLF_x flags from ssl.h */
 #if PORT_SHARE
   char *port_share_host;
   int port_share_port;
@@ -498,6 +497,7 @@ struct options
   unsigned remote_cert_ku[MAX_PARMS];
   const char *remote_cert_eku;
   uint8_t *verify_hash;
+  unsigned int ssl_flags; /* set to SSLF_x flags from ssl.h */
 
 #ifdef ENABLE_PKCS11
   const char *pkcs11_providers[MAX_PARMS];

diff --git a/version.m4 b/version.m4
index 3642b719601987b5467817e963dc7276bb30ebd6..77e4950c7465b3fad58cd416f068ee174561d7e5 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,5 @@
 dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.1.3v])
+define(PRODUCT_VERSION,[2.1.3w])
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])