diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-13 00:55:02 +0100 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-13 00:55:02 +0100 |
| commit | 1aa664cef51e4b4ed4b35e569925acb4fd7b9b52 (patch) | |
| tree | 616d3705094f7a68ddc7c3929b8a9c0afc20509a /options.c | |
| parent | Merge branch 'bugfix2.1' into beta2.2 (diff) | |
| parent | Make "topology subnet" work on Solaris (ifconfig + route metric changes by Ka... (diff) | |
| download | openvpn-1aa664cef51e4b4ed4b35e569925acb4fd7b9b52.tar.xz | |
Merge branch 'feat_misc' into beta2.2
Conflicts:
Makefile.am
openvpn.8
options.c
socket.c
ssl.c
- feat_misc is missing a lot of bugfix2.1 changes
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'options.c')
| -rw-r--r-- | options.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -128,8 +128,11 @@ static const char usage_message[] = " AGENT user-agent\n" #endif #ifdef ENABLE_SOCKS - "--socks-proxy s [p]: Connect to remote host through a Socks5 proxy at address\n" - " s and port p (default port = 1080).\n" + "--socks-proxy s [p] [up] : Connect to remote host through a Socks5 proxy at\n" + " address s and port p (default port = 1080).\n" + " If proxy authentication is required,\n" + " up is a file containing username/password on 2 lines, or\n" + " 'stdin' to prompt for console.\n" "--socks-proxy-retry : Retry indefinitely on Socks proxy errors.\n" #endif "--resolv-retry n: If hostname resolve fails for --remote, retry\n" @@ -4505,6 +4508,7 @@ add_option (struct options *options, options->ce.socks_proxy_port = 1080; } options->ce.socks_proxy_server = p[1]; + options->ce.socks_proxy_authfile = p[3]; /* might be NULL */ } else if (streq (p[0], "socks-proxy-retry")) { |