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)

diff --git a/openvpn.8 b/openvpn.8
index 7d213f98e931e3cab2c6e8fa7c58fc5058d716ee..64445583ef16c0015d6db8d215f4b4465136e7ea 100644 (file)
--- 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 77089956660b6f0ebd5523db028ac06b2745d224..4a11f53e8b3172f3cbe1d2aac62ed77386b2de3b 100644 (file)
--- 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"