From 399b9b6769908f98e4dfb9658d3f9fae0ee03719 Mon Sep 17 00:00:00 2001
From: Benjamin Asbach <asbachb@benjamins-mbp.fritz.box>
Date: Sat, 04 Jan 2014 10:29:12 -0500
Subject: [PATCH] Evaluate X_Forwarded_Context only when X-Forwarded-Context is not set
---
src/main/java/com/gitblit/ConfigUserService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/ConfigUserService.java b/src/main/java/com/gitblit/ConfigUserService.java
index aae7c14..c1f0506 100644
--- a/src/main/java/com/gitblit/ConfigUserService.java
+++ b/src/main/java/com/gitblit/ConfigUserService.java
@@ -859,7 +859,7 @@
user.emailAddress = config.getString(USER, username, EMAILADDRESS);
user.accountType = AccountType.fromString(config.getString(USER, username, ACCOUNTTYPE));
if (Constants.EXTERNAL_ACCOUNT.equals(user.password) && user.accountType.isLocal()) {
- user.accountType = null;
+ user.accountType = AccountType.EXTERNAL;
}
user.organizationalUnit = config.getString(USER, username, ORGANIZATIONALUNIT);
user.organization = config.getString(USER, username, ORGANIZATION);
--
Gitblit v1.9.1