summaryrefslogtreecommitdiffstats
path: root/src/openvpn/options.c
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-03-17 13:56:53 +0100
committerGert Doering <gert@greenie.muc.de>2014-03-17 19:33:24 +0100
commit74d53c9bf986d835e1862aa3989fac186b5d76f3 (patch)
tree5cf0efe811287f95ec7b7be9c3c3109d8f4d1bdd /src/openvpn/options.c
parent5a197f7773520b64956c59b2ebc35b9a88166308 (diff)
downloadopenvpn-74d53c9bf986d835e1862aa3989fac186b5d76f3.tar.gz
openvpn-74d53c9bf986d835e1862aa3989fac186b5d76f3.tar.xz
openvpn-74d53c9bf986d835e1862aa3989fac186b5d76f3.zip
Introduce safety check for http proxy options
Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <1395061013-1802-1-git-send-email-arne@rfc2549.org> URL: http://article.gmane.org/gmane.network.openvpn.devel/8353 Signed-off-by: Gert Doering <gert@greenie.muc.de> (cherry picked from commit 087b510365d9aad8f656a8fb0cc07d51511be9d0)
Diffstat (limited to 'src/openvpn/options.c')
-rw-r--r--src/openvpn/options.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 34e44ec..7741dbf 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -1979,6 +1979,8 @@ options_postprocess_verify_ce (const struct options *options, const struct conne
#ifdef ENABLE_HTTP_PROXY
if ((ce->http_proxy_options) && ce->proto != PROTO_TCPv4_CLIENT)
msg (M_USAGE, "--http-proxy MUST be used in TCP Client mode (i.e. --proto tcp-client)");
+ if ((ce->http_proxy_options) && !ce->http_proxy_options->server)
+ msg (M_USAGE, "--http-proxy not specified but other http proxy options present");
#endif
#if defined(ENABLE_HTTP_PROXY) && defined(ENABLE_SOCKS)