diff options
| author | James Moger <james.moger@gmail.com> | 2015-12-10 09:55:23 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gmail.com> | 2015-12-10 09:55:23 -0500 |
| commit | 7b7b0d54b606e5a7d63ea39ec8918968f612d61d (patch) | |
| tree | ce2e6e349123a59cb04957eb1dcaa6d170952c51 /src/main/java/com/gitblit/ConfigUserService.java | |
| parent | 280c0c041ed830a4d5874b60adf1b72760326c6a (diff) | |
| parent | fd0fc5fc9a13456c4038d03cbc6c6b3beed38910 (diff) | |
| download | gitblit-7b7b0d54b606e5a7d63ea39ec8918968f612d61d.tar.gz gitblit-7b7b0d54b606e5a7d63ea39ec8918968f612d61d.zip | |
Merge pull request #980 from mrjoel/mrjoel-httpheaders
Refactor authentication for servlet HTTP header handler
Diffstat (limited to 'src/main/java/com/gitblit/ConfigUserService.java')
| -rw-r--r-- | src/main/java/com/gitblit/ConfigUserService.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/java/com/gitblit/ConfigUserService.java b/src/main/java/com/gitblit/ConfigUserService.java index 200ec8a6..6d7230f7 100644 --- a/src/main/java/com/gitblit/ConfigUserService.java +++ b/src/main/java/com/gitblit/ConfigUserService.java @@ -890,9 +890,6 @@ public class ConfigUserService implements IUserService { user.displayName = config.getString(USER, username, DISPLAYNAME);
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 = AccountType.EXTERNAL;
- }
user.disabled = config.getBoolean(USER, username, DISABLED, false);
user.organizationalUnit = config.getString(USER, username, ORGANIZATIONALUNIT);
user.organization = config.getString(USER, username, ORGANIZATION);
|