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/socks.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/socks.c')
| -rw-r--r-- | src/openvpn/socks.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/openvpn/socks.c b/src/openvpn/socks.c index 510c110..dd54c8d 100644 --- a/src/openvpn/socks.c +++ b/src/openvpn/socks.c @@ -63,23 +63,10 @@ struct socks_proxy_info * socks_proxy_new (const char *server, int port, const char *authfile, - bool retry, - struct auto_proxy_info *auto_proxy_info) + bool retry) { struct socks_proxy_info *p; - if (auto_proxy_info) - { - if (!server) - { - if (!auto_proxy_info->socks.server) - return NULL; - - server = auto_proxy_info->socks.server; - port = auto_proxy_info->socks.port; - } - } - ALLOC_OBJ_CLEAR (p, struct socks_proxy_info); ASSERT (server); |