diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-06-11 08:45:09 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-06-11 08:45:09 +0000 |
| commit | 90efcacba6378a4e29275cd6e9914d73d836a4a4 (patch) | |
| tree | da032ba71582994f9e1f2ed7162ba14f152cb7d7 /syshead.h | |
| parent | 4d84de11b1fdd795b00086f1901787de358c9230 (diff) | |
| download | openvpn-90efcacba6378a4e29275cd6e9914d73d836a4a4.tar.gz openvpn-90efcacba6378a4e29275cd6e9914d73d836a4a4.tar.xz openvpn-90efcacba6378a4e29275cd6e9914d73d836a4a4.zip | |
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 'syshead.h')
| -rw-r--r-- | syshead.h | 29 |
1 files changed, 25 insertions, 4 deletions
@@ -471,20 +471,41 @@ socket_defined (const socket_descriptor_t sd) #endif /* - * Enable deferred authentication + * Enable deferred authentication? */ -#if defined(ENABLE_PLUGIN) && P2MP_SERVER +#define CONFIGURE_DEF_AUTH /* this should be set by autoconf and config.h */ +#if defined(CONFIGURE_DEF_AUTH) && defined(P2MP_SERVER) && defined(ENABLE_PLUGIN) +#define PLUGIN_DEF_AUTH +#endif +#if defined(CONFIGURE_DEF_AUTH) && defined(P2MP_SERVER) && defined(ENABLE_MANAGEMENT) +#define MANAGEMENT_DEF_AUTH +#endif +#if defined(PLUGIN_DEF_AUTH) || defined(MANAGEMENT_DEF_AUTH) #define ENABLE_DEF_AUTH #endif /* - * Enable packet filter + * Enable packet filter? */ -#if defined(ENABLE_PLUGIN) && P2MP_SERVER && defined(HAVE_STAT) +#define CONFIGURE_PF /* this should be set by autoconf and config.h */ +#if defined(CONFIGURE_PF) && defined(P2MP_SERVER) && defined(ENABLE_PLUGIN) && defined(HAVE_STAT) +#define PLUGIN_PF +#endif +#if defined(CONFIGURE_PF) && defined(P2MP_SERVER) && defined(MANAGEMENT_DEF_AUTH) +#define MANAGEMENT_PF +#endif +#if defined(PLUGIN_PF) || defined(MANAGEMENT_PF) #define ENABLE_PF #endif /* + * Don't compile the struct buffer_list code unless something needs it + */ +#if defined(ENABLE_MANAGEMENT) || defined(ENABLE_PF) +#define ENABLE_BUFFER_LIST +#endif + +/* * Do we have pthread capability? */ #ifdef USE_PTHREAD |