From: David Sommerseth <dazo@users.sourceforge.net>
Date: Sun, 16 May 2010 17:35:08 +0000 (+0200)
Subject: Merge branch 'master' into bugfix2.1
X-Git-Tag: v2.2-beta1~7^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=942e05525ac2cbf4a258c7b8f514a058cd00486b;p=thirdparty%2Fopenvpn.git

Merge branch 'master' into bugfix2.1

Conflicts:
	openvpn.8
	--http-proxy is enhanced with auth-nct for auth (no-clear-text)

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
---

942e05525ac2cbf4a258c7b8f514a058cd00486b
diff --cc openvpn.8
index f2ad5d036,12294be80..6357b9526
--- a/openvpn.8
+++ b/openvpn.8
@@@ -474,7 -474,7 +474,7 @@@ InternetQueryOption API
  This option exists in OpenVPN 2.1 or higher.
  .\"*********************************************************
  .TP
- .B \-\-http-proxy server port [authfile|'auto'] [auth-method]
 -.B --http-proxy server port [authfile|'auto'|'auto-nct'] [auth-method]
++.B \-\-http-proxy server port [authfile|'auto'|'auto-nct'] [auth-method]
  Connect to remote host through an HTTP proxy at address
  .B server
  and port
@@@ -494,9 -501,15 +501,15 @@@ flag causes OpenVPN to automatically de
  and query stdin or the management interface for
  username/password credentials, if required.  This flag
  exists on OpenVPN 2.1 or higher.
+ 
+ The
+ .B auto-nct
+ flag (no clear-text auth) instructs OpenVPN to automatically
+ determine the authentication method, but to reject weak
+ authentication protocols such as HTTP Basic Authentication.
  .\"*********************************************************
  .TP
 -.B --http-proxy-retry
 +.B \-\-http-proxy-retry
  Retry indefinitely on HTTP proxy errors.  If an HTTP proxy error
  occurs, simulate a SIGUSR1 reset.
  .\"*********************************************************