diff options
author | David Sommerseth <dazo@users.sourceforge.net> | 2010-05-16 19:35:08 +0200 |
---|---|---|
committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-05-16 19:35:08 +0200 |
commit | 942e05525ac2cbf4a258c7b8f514a058cd00486b (patch) | |
tree | a0c2ffb02472271b5bf84855c050a1b8fe1ae2b2 /syshead.h | |
parent | Avoid repetition of "this config may cache passwords in memory" (v2) (diff) | |
parent | Cleaning up after rebase (diff) | |
download | openvpn-942e05525ac2cbf4a258c7b8f514a058cd00486b.tar.xz |
Merge branch 'master' into bugfix2.1
Conflicts:
openvpn.8
--http-proxy is enhanced with auth-nct for auth (no-clear-text)
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'syshead.h')
-rw-r--r-- | syshead.h | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -576,6 +576,15 @@ socket_defined (const socket_descriptor_t sd) #endif /* + * Should we include proxy digest auth functionality + */ +#if defined(USE_CRYPTO) && defined(ENABLE_HTTP_PROXY) +#define PROXY_DIGEST_AUTH 1 +#else +#define PROXY_DIGEST_AUTH 0 +#endif + +/* * Should we include code common to all proxy methods? */ #if defined(ENABLE_HTTP_PROXY) || defined(ENABLE_SOCKS) |