aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-04-27 18:43:50 +0200
committerDavid Sommerseth <dazo@users.sourceforge.net>2011-04-27 18:51:09 +0200
commit60fdd9b01deab10f9a62ee9235ad9ec16873b5d5 (patch)
tree8f9a206270f45b69b716d060a1a919f2435ef4c6
parentTagging the v2.2.0 release (diff)
downloadopenvpn-60fdd9b01deab10f9a62ee9235ad9ec16873b5d5.tar.xz
Fix compile issues when using --enable-small and --disable-ssl/--disable-crypto
The tmp_dir string is required in the options struct regardless of options so spin it out of #if conditionals. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: David Sommerseth <dazo@users.sourceforge.net> Signed-off-by: David Sommerseth <dazo@users.sourceforge.net> (cherry picked from commit b70d99fb617350b252c8bde2f1f2d81d3f5b7955)
-rw-r--r--options.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/options.h b/options.h
index 7f4c0cd..dd49355 100644
--- a/options.h
+++ b/options.h
@@ -355,6 +355,8 @@ struct options
struct plugin_option_list *plugin_list;
#endif
+ const char *tmp_dir;
+
#if P2MP
#if P2MP_SERVER
@@ -387,7 +389,6 @@ struct options
const char *client_connect_script;
const char *client_disconnect_script;
const char *learn_address_script;
- const char *tmp_dir;
const char *client_config_dir;
bool ccd_exclusive;
bool disable;