aboutsummaryrefslogtreecommitdiff
path: root/options.h
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-06-11 08:45:09 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-06-11 08:45:09 +0000
commit90efcacba6378a4e29275cd6e9914d73d836a4a4 (patch)
treeda032ba71582994f9e1f2ed7162ba14f152cb7d7 /options.h
parentAdded support for building and linking with (diff)
downloadopenvpn-90efcacba6378a4e29275cd6e9914d73d836a4a4.tar.xz
Updated version to 2.1_rc7e.
Added client authentication and packet filtering capability to management interface. Extended packet filtering capability to work on both --dev tun and --dev tap tunnels. Updated valgrind-suppress file. Made "Linux ip addr del failed" error nonfatal. Amplified --client-cert-not-required warning. Added #pragma pack to proto.h. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2991 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to '')
-rw-r--r--options.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/options.h b/options.h
index 607df0f..39f2ac6 100644
--- a/options.h
+++ b/options.h
@@ -281,12 +281,10 @@ struct options
int management_log_history_cache;
int management_echo_buffer_size;
int management_state_buffer_size;
- bool management_query_passwords;
- bool management_hold;
- bool management_signal;
- bool management_forget_disconnect;
- bool management_client;
const char *management_write_peer_info_file;
+
+ /* Mask of MF_ values of manage.h */
+ unsigned int management_flags;
#endif
#ifdef ENABLE_PLUGIN
@@ -537,6 +535,12 @@ struct options
#define PLUGIN_OPTION_LIST(opt) (NULL)
#endif
+#ifdef MANAGEMENT_DEF_AUTH
+#define MAN_CLIENT_AUTH_ENABLED(opt) ((opt)->management_flags & MF_CLIENT_AUTH)
+#else
+#define MAN_CLIENT_AUTH_ENABLED(opt) (false)
+#endif
+
void parse_argv (struct options *options,
const int argc,
char *argv[],
@@ -632,9 +636,7 @@ const char *auth_retry_print (void);
#endif
-#ifdef ENABLE_PLUGIN
-
-void options_plugin_import (struct options *options,
+void options_string_import (struct options *options,
const char *config,
const int msglevel,
const unsigned int permission_mask,
@@ -642,5 +644,3 @@ void options_plugin_import (struct options *options,
struct env_set *es);
#endif
-
-#endif