diff options
author | Arne Schwabe | 2014-07-07 14:12:20 +0200 |
---|---|---|
committer | Gert Doering | 2014-07-18 20:00:17 +0200 |
commit | a4b8f653ee5be9c2292cf92dac09d7aadcc9a487 (patch) | |
tree | 1380401c2df704e1c3c104e5da0ecec709e729cd /src/openvpn/proxy.c | |
parent | c277757fcf7fb4c2713db154439f937d48cfae61 (diff) | |
download | openvpn-a4b8f653ee5be9c2292cf92dac09d7aadcc9a487.zip openvpn-a4b8f653ee5be9c2292cf92dac09d7aadcc9a487.tar.gz |
Always enable http-proxy and socks-proxy
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1404735142-31420-2-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8840
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/proxy.c')
-rw-r--r-- | src/openvpn/proxy.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/openvpn/proxy.c b/src/openvpn/proxy.c index f7f0648..2568e19 100644 --- a/src/openvpn/proxy.c +++ b/src/openvpn/proxy.c @@ -42,8 +42,6 @@ #include "ntlm.h" #include "memdbg.h" -#ifdef ENABLE_HTTP_PROXY - #define UP_TYPE_PROXY "HTTP Proxy" struct http_proxy_options * @@ -945,8 +943,3 @@ establish_http_proxy_passthru (struct http_proxy_info *p, gc_free (&gc); return ret; } - -#else -static void dummy(void) {} -#endif /* ENABLE_HTTP_PROXY */ - |