diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2011-04-26 23:04:18 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2011-04-26 23:04:18 +0200 |
| commit | 20b18fd799e2ea9d0651f3ef913dd9ce2e481471 (patch) | |
| tree | 86867a1128f35087f37d4b49ecf241b7b8e6b38e /syshead.h | |
| parent | c5f7d08b8c3d4287dd40bbdf52525add8f5cee20 (diff) | |
| parent | e4359af463463097dd80e679836905bcd8ad7a13 (diff) | |
| download | openvpn-20b18fd799e2ea9d0651f3ef913dd9ce2e481471.tar.gz openvpn-20b18fd799e2ea9d0651f3ef913dd9ce2e481471.tar.xz openvpn-20b18fd799e2ea9d0651f3ef913dd9ce2e481471.zip | |
Merge branch 'svn-branch-2.1' into merge
Pulling in changes from James' 2.1/openvpn branch in SVN.
Conflicts:
buffer.c
init.c
manage.h
multi.c
openvpn.8
options.c
ssl.c
version.m4
win/sign.py
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'syshead.h')
| -rw-r--r-- | syshead.h | 24 |
1 files changed, 24 insertions, 0 deletions
@@ -599,6 +599,13 @@ socket_defined (const socket_descriptor_t sd) #endif /* + * Enable x509-track feature? + */ +#if defined(USE_CRYPTO) && defined(USE_SSL) +#define ENABLE_X509_TRACK +#endif + +/* * Is poll available on this platform? */ #if defined(HAVE_POLL) && defined(HAVE_SYS_POLL_H) @@ -676,4 +683,21 @@ socket_defined (const socket_descriptor_t sd) */ #define ENABLE_PUSH_PEER_INFO +/* + * Do we support internal client-side NAT? + */ +#define ENABLE_CLIENT_NAT + +/* + * Support LZO as a stub in client? (LZO lib not included, but we + * we still support LZO protocol changes that allow us to + * communicate with an LZO-enabled server) + */ +#ifdef LZO_STUB +#undef USE_LZO +#undef LZO_VERSION_NUM +#define USE_LZO 1 +#define LZO_VERSION_NUM "STUB" +#endif + #endif |