aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Yonan <james@openvpn.net>2010-06-10 03:17:21 +0000
committerJames Yonan <james@openvpn.net>2010-06-10 03:17:21 +0000
commitd222fcc587de09da0cb4681526e56b944313b22f (patch)
treed9c56e7688df37c1de9fbdc8284f9dd66eb74a48
parentImplemented a key/value auth channel from client to server. (diff)
downloadopenvpn-d222fcc587de09da0cb4681526e56b944313b22f.tar.xz
Fixed issue where bad creds provided by the management interface
for HTTP Proxy Basic Authentication would go into an infinite retry-fail loop instead of requerying the management interface for new creds. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@5701 e7ae566f-a301-0410-adde-c780ea21d3b5
-rw-r--r--proxy.c7
-rw-r--r--version.m42
2 files changed, 6 insertions, 3 deletions
diff --git a/proxy.c b/proxy.c
index ac3fc65..3de2ac1 100644
--- a/proxy.c
+++ b/proxy.c
@@ -620,8 +620,11 @@ establish_http_proxy_passthru (struct http_proxy_info *p,
{
msg (D_PROXY, "Proxy requires authentication");
- /* check for NTLM */
- if ((p->auth_method == HTTP_AUTH_NTLM || p->auth_method == HTTP_AUTH_NTLM2) && !processed)
+ if (p->auth_method == HTTP_AUTH_BASIC && !processed)
+ {
+ processed = true;
+ }
+ else if ((p->auth_method == HTTP_AUTH_NTLM || p->auth_method == HTTP_AUTH_NTLM2) && !processed) /* check for NTLM */
{
#if NTLM
/* look for the phase 2 response */
diff --git a/version.m4 b/version.m4
index 8df30d5..02d8e71 100644
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,5 @@
dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.1.1i])
+define(PRODUCT_VERSION,[2.1.1j])
dnl define the TAP version
define(PRODUCT_TAP_ID,[tap0901])
define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])