diff options
Diffstat (limited to 'syshead.h')
| -rw-r--r-- | syshead.h | 46 |
1 files changed, 38 insertions, 8 deletions
@@ -5,7 +5,7 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2009 OpenVPN Technologies, Inc. <sales@openvpn.net> + * Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 @@ -85,6 +85,10 @@ #endif #ifdef HAVE_SYS_SOCKET_H +# if defined(TARGET_LINUX) && !defined(_GNU_SOURCE) + /* needed for peercred support on glibc-2.8 */ +# define _GNU_SOURCE +# endif #include <sys/socket.h> #endif @@ -531,11 +535,9 @@ socket_defined (const socket_descriptor_t sd) #endif /* - * Don't compile the struct buffer_list code unless something needs it + * Compile the struct buffer_list code */ -#if defined(ENABLE_MANAGEMENT) || defined(ENABLE_PF) #define ENABLE_BUFFER_LIST -#endif /* * Should we include OCC (options consistency check) code? @@ -554,6 +556,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) @@ -598,6 +609,22 @@ socket_defined (const socket_descriptor_t sd) #define ENABLE_INLINE_FILES 1 /* + * Support "connection" directive + */ +#if ENABLE_INLINE_FILES +#define ENABLE_CONNECTION 1 +#endif + +/* + * Should we include http proxy fallback functionality + */ +#if defined(ENABLE_CONNECTION) && defined(ENABLE_MANAGEMENT) && defined(ENABLE_HTTP_PROXY) +#define HTTP_PROXY_FALLBACK 1 +#else +#define HTTP_PROXY_FALLBACK 0 +#endif + +/* * Reduce sensitivity to system clock instability * and backtracks. */ @@ -620,10 +647,13 @@ socket_defined (const socket_descriptor_t sd) #endif /* - * Support "connection" directive + * Do we support challenge/response authentication, as a console-based client? */ -#if ENABLE_INLINE_FILES -#define ENABLE_CONNECTION 1 -#endif +#define ENABLE_CLIENT_CR + +/* + * Do we support pushing peer info? + */ +#define ENABLE_PUSH_PEER_INFO #endif |