summaryrefslogtreecommitdiff
path: root/openvpn/src/openvpn/options.h
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-06-02 15:45:11 +0200
committerArne Schwabe <arne@rfc2549.org>2012-06-02 15:45:11 +0200
commit4ddf2ac169fbb4931b5268962b02cdca33323ccd (patch)
treedae21582837ec7d1cdda84b482377c4e7ee7e929 /openvpn/src/openvpn/options.h
parent9b069ae8b8c4c458559f400211a0cfbc44c63938 (diff)
bring openvpn in sync with openvpn git master and patches submitted to mailing list
Diffstat (limited to 'openvpn/src/openvpn/options.h')
-rw-r--r--openvpn/src/openvpn/options.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/openvpn/src/openvpn/options.h b/openvpn/src/openvpn/options.h
index 1be3dfaf..50d42fb7 100644
--- a/openvpn/src/openvpn/options.h
+++ b/openvpn/src/openvpn/options.h
@@ -403,7 +403,9 @@ struct options
struct plugin_option_list *plugin_list;
#endif
+#ifdef ENABLE_TMPDIR
const char *tmp_dir;
+#endif
#if P2MP
@@ -749,9 +751,6 @@ bool apply_push_options (struct options *options,
unsigned int *option_types_found,
struct env_set *es);
-bool is_persist_option (const struct options *o);
-bool is_stateful_restart (const struct options *o);
-
void options_detach (struct options *o);
void options_server_import (struct options *o,