Introduce safety check for http proxy options

PATCH In review Arne Schwabe 2 participants 2 messages Mar 17, 2014

Share & tools

Arne Schwabe

author

2014-03-17 12:56 UTC #0 lore raw

PATCH 1/1 Introduce safety check for http proxy options

---
 src/openvpn/options.c | 3 +++
 1 file changed, 3 insertions(+)

src/openvpn/options.c +3 -0

index d69e28f..d4c8196 100644
@@ -1986,6 +1986,9 @@ options_postprocess_verify_ce (const struct options *options, const struct conne
 #ifdef ENABLE_HTTP_PROXY
   if ((ce->http_proxy_options) && ce->proto != PROTO_TCP_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)

Signature · 1 line

1.8.5.2 (Apple Git-48)

Gert Doering

2014-03-17 19:12 UTC #1 lore raw

ACK. Patch has been applied to the master and release/2.3 branches.

commit 087b510365d9aad8f656a8fb0cc07d51511be9d0 (master) commit 74d53c9bf986d835e1862aa3989fac186b5d76f3 (release/2.3)

Author: Arne Schwabe
Date:   Mon Mar 17 13:56:53 2014 +0100

     Introduce safety check for http proxy options

     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/8353
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering