summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Fischer <ml-openvpn@trispace.org>2011-04-21 21:36:10 +0200
committerDavid Sommerseth <davids@redhat.com>2011-06-14 11:05:53 +0200
commit0010dd8d40ab3360b2ec8cbb3c8bbeb73546f3bb (patch)
tree153daf61ff9c4f8e19da1497669cdee677c79def
parent05485d7f7733ba498262abc127795910fda0d0bb (diff)
downloadopenvpn-0010dd8d40ab3360b2ec8cbb3c8bbeb73546f3bb.tar.gz
openvpn-0010dd8d40ab3360b2ec8cbb3c8bbeb73546f3bb.tar.xz
openvpn-0010dd8d40ab3360b2ec8cbb3c8bbeb73546f3bb.zip
Added info about --show-proxy-settings
Signed-off-by: Robert Fischer <ml-openvpn@trispace.org> Acked-by: David Sommerseth <davids@redhat.com> Signed-off-by: David Sommerseth <davids@redhat.com> (cherry picked from commit 54d40afdfa56f38030d7b440cb379abf9c9ddabc)
-rw-r--r--openvpn.85
-rw-r--r--options.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/openvpn.8 b/openvpn.8
index 7d213f9..6444558 100644
--- a/openvpn.8
+++ b/openvpn.8
@@ -494,6 +494,11 @@ InternetQueryOption API.
This option exists in OpenVPN 2.1 or higher.
.\"*********************************************************
.TP
+.B \-\-show-proxy-settings
+Show sensed HTTP or SOCKS proxy settings. Currently, only Windows clients
+support this option.
+.\"*********************************************************
+.TP
.B \-\-http-proxy server port [authfile|'auto'|'auto-nct'] [auth-method]
Connect to remote host through an HTTP proxy at address
.B server
diff --git a/options.c b/options.c
index 7708995..4a11f53 100644
--- a/options.c
+++ b/options.c
@@ -107,6 +107,7 @@ static const char usage_message[] =
"--connect-retry-max n : Maximum connection attempt retries, default infinite.\n"
#ifdef GENERAL_PROXY_SUPPORT
"--auto-proxy : Try to sense proxy settings (or lack thereof) automatically.\n"
+ "--show-proxy-settings : Show sensed proxy settings.\n"
#endif
#ifdef ENABLE_HTTP_PROXY
"--http-proxy s p [up] [auth] : Connect to remote host\n"