diff options
author | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-13 00:48:28 +0100 |
---|---|---|
committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-13 00:48:28 +0100 |
commit | 8367889e8467ce73b051aa8db64b0336aea8ed4b (patch) | |
tree | 99578b1e6969d7eeb19b2578137c1c92de2fc49b /syshead.h | |
parent | 0bb41e58782ae9834a61491c5964bc9816b76bc8 (diff) | |
parent | 20a4c12783144d798c6b7446bae8920fdfea7adc (diff) | |
download | openvpn-8367889e8467ce73b051aa8db64b0336aea8ed4b.tar.gz openvpn-8367889e8467ce73b051aa8db64b0336aea8ed4b.tar.xz openvpn-8367889e8467ce73b051aa8db64b0336aea8ed4b.zip |
Merge branch 'svn-BETA21' into beta2.2
Conflicts:
version.m4
- Reset version.m4 to a more neutral version number
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'syshead.h')
-rw-r--r-- | syshead.h | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -665,6 +665,11 @@ socket_defined (const socket_descriptor_t sd) #endif /* + * Do we support challenge/response authentication, as a console-based client? + */ +#define ENABLE_CLIENT_CR + +/* * Do we support pushing peer info? */ #define ENABLE_PUSH_PEER_INFO |