From 3c94742aed91c1e7597e4e75d967c1d7a6bdbb84 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 14 Jan 2014 09:28:04 -0500
Subject: [PATCH] Merge pull request #135 from kxyfyh/branch_fixbug
---
src/main/java/com/gitblit/manager/AuthenticationManager.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/AuthenticationManager.java b/src/main/java/com/gitblit/manager/AuthenticationManager.java
index 60687d4..eef675b 100644
--- a/src/main/java/com/gitblit/manager/AuthenticationManager.java
+++ b/src/main/java/com/gitblit/manager/AuthenticationManager.java
@@ -323,9 +323,10 @@
return null;
}
- // try local authentication
UserModel user = userManager.getUserModel(usernameDecoded);
- if (user != null) {
+
+ // try local authentication
+ if (user != null && user.isLocalAccount()) {
UserModel returnedUser = null;
if (user.password.startsWith(StringUtils.MD5_TYPE)) {
// password digest
--
Gitblit v1.9.1