summaryrefslogtreecommitdiff
path: root/openvpn/src/openvpn/syshead.h
diff options
context:
space:
mode:
Diffstat (limited to 'openvpn/src/openvpn/syshead.h')
-rw-r--r--openvpn/src/openvpn/syshead.h31
1 files changed, 4 insertions, 27 deletions
diff --git a/openvpn/src/openvpn/syshead.h b/openvpn/src/openvpn/syshead.h
index ed00e821..163d2bb2 100644
--- a/openvpn/src/openvpn/syshead.h
+++ b/openvpn/src/openvpn/syshead.h
@@ -506,7 +506,6 @@ socket_defined (const socket_descriptor_t sd)
#if P2MP && !defined(ENABLE_CLIENT_ONLY)
#define P2MP_SERVER 1
-#define ENABLE_TMPDIR 1
#else
#define P2MP_SERVER 0
#endif
@@ -651,34 +650,12 @@ socket_defined (const socket_descriptor_t sd)
#endif
/*
- * Should we allow ca/cert/key files to be
- * included inline, in the configuration file?
+ * Should we include http proxy override functionality
*/
-#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
-
-/*
- * Should we include --management-query-remote functionality
- */
-#if defined(ENABLE_CONNECTION) && defined(ENABLE_MANAGEMENT)
-#define MANAGEMENT_QUERY_REMOTE 1
+#if defined(ENABLE_MANAGEMENT) && defined(ENABLE_HTTP_PROXY)
+#define HTTP_PROXY_OVERRIDE 1
#else
-#define MANAGEMENT_QUERY_REMOTE 0
+#define HTTP_PROXY_OVERRIDE 0
#endif
/*