]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Fix compile issues when using --enable-small and --disable-ssl/--disable-crypto
authorGustavo Zacarias <gustavo@zacarias.com.ar>
Wed, 27 Apr 2011 16:43:50 +0000 (18:43 +0200)
committerDavid Sommerseth <dazo@users.sourceforge.net>
Wed, 27 Apr 2011 16:51:09 +0000 (18:51 +0200)
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)

options.h

index 7f4c0cd1a819d3bbc63f85c2d000c15d782dc979..dd49355712036994a229119c02d5ba5351703ae9 100644 (file)
--- 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;