r7316 fixes.

Version 2.1.3x1.

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

diff --git a/options.c b/options.c
index bbe9f67bbaaa9613d385c07d9211e54a7b851446..b81863b961c6bb654194970f747118a1e32ec861 100644 (file)
--- a/options.c
+++ b/options.c
@@ -5256,6 +5256,7 @@ add_option (struct options *options,
 #ifdef ENABLE_CLIENT_CR
   else if (streq (p[0], "static-challenge") && p[1] && p[2])
     {
+      VERIFY_PERMISSION (OPT_P_GENERAL);
       options->sc_info.challenge_text = p[1];
       if (atoi(p[2]))
        options->sc_info.flags |= SC_ECHO;

diff --git a/options.h b/options.h
index f74c9b3da8ca7a1757c8cf6e36402380d4eb62f7..34bacecfcded709d57e66250233d7e58bf7eed42 100644 (file)
--- a/options.h
+++ b/options.h
@@ -426,9 +426,6 @@ struct options
 
   const char *auth_user_pass_verify_script;
   bool auth_user_pass_verify_script_via_file;
-#ifdef ENABLE_CLIENT_CR
-  struct static_challenge_info sc_info;
-#endif
 #if PORT_SHARE
   char *port_share_host;
   int port_share_port;
@@ -446,6 +443,9 @@ struct options
 
   int scheduled_exit_interval;
 
+#ifdef ENABLE_CLIENT_CR
+  struct static_challenge_info sc_info;
+#endif
 #endif
 
 #ifdef USE_CRYPTO

diff --git a/version.m4 b/version.m4
index f7d5007b636aa4f9bf1cd5395a299c7ce0bac587..c9c81bfca3b654e17ef7d4230fe462e2e6dd863d 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,5 @@
 dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.1.3x])
+define(PRODUCT_VERSION,[2.1.3x1])
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])