diff options
| author | Heiko Hund <heiko.hund@sophos.com> | 2012-02-05 13:47:09 +0100 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2012-06-13 10:44:33 +0200 |
| commit | 8e1975b046dcf821eaf03098677dc5e34cd3a1a5 (patch) | |
| tree | 3bd5f67b3c97ead27dd26f68164bc4883655f98d /src/openvpn/init.c | |
| parent | e656b995b44fab0b8290c6c2a4a73079b3f9813b (diff) | |
| download | openvpn-8e1975b046dcf821eaf03098677dc5e34cd3a1a5.tar.gz openvpn-8e1975b046dcf821eaf03098677dc5e34cd3a1a5.tar.xz openvpn-8e1975b046dcf821eaf03098677dc5e34cd3a1a5.zip | |
remove the --auto-proxy option from openvpn
During discussion on FOSDEM 2012 it was decided that proxy auto detection
is best done in the GUI as it's highly platform specific and shouldn't be
handled in openvpn itself for every supported platform in openvpn itself.
This removes --auto-proxy from openvpn.
Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-by: David Sommerseth <davids@redhat.com>
Message-Id: 1328446029-30523-1-git-send-email-heiko.hund@sophos.com
URL: http://article.gmane.org/gmane.network.openvpn.devel/5333
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'src/openvpn/init.c')
| -rw-r--r-- | src/openvpn/init.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 61ced5d..30f5803 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -498,11 +498,10 @@ init_proxy_dowork (struct context *c) uninit_proxy_dowork (c); #ifdef ENABLE_HTTP_PROXY - if (c->options.ce.http_proxy_options || c->options.auto_proxy_info) + if (c->options.ce.http_proxy_options) { /* Possible HTTP proxy user/pass input */ - c->c1.http_proxy = http_proxy_new (c->options.ce.http_proxy_options, - c->options.auto_proxy_info); + c->c1.http_proxy = http_proxy_new (c->options.ce.http_proxy_options); if (c->c1.http_proxy) { did_http = true; @@ -512,13 +511,12 @@ init_proxy_dowork (struct context *c) #endif #ifdef ENABLE_SOCKS - if (!did_http && (c->options.ce.socks_proxy_server || c->options.auto_proxy_info)) + if (!did_http && c->options.ce.socks_proxy_server) { c->c1.socks_proxy = socks_proxy_new (c->options.ce.socks_proxy_server, c->options.ce.socks_proxy_port, c->options.ce.socks_proxy_authfile, - c->options.ce.socks_proxy_retry, - c->options.auto_proxy_info); + c->options.ce.socks_proxy_retry); if (c->c1.socks_proxy) { c->c1.socks_proxy_owned = true; |