Fixed bug with adding new local users with external authentication

diff --git a/releases.moxie b/releases.moxie
index f2a27b7c6ceaa6a8cead382ff72037b6bf653fcf..2e3daf58ae8e62372279e9c70a18e1af328e1d4c 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -14,8 +14,9 @@ r18: {
        - Fixed missing model class dependencies in Gitblit Manager build
        - Fix for IE10 compatability mode
        - Reset dashboard and activity commit cache on branch REWIND or DELETE
+       - Fixed bug with adding new local users with external authentication
     changes:
-       - updated Chinese translation
+       - updated Chinese translation   
     additions: ~
     dependencyChanges: ~
     contributors:

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 301591f5d71f06d8b90f9f1d0de14cca13972e4b..35ef7708a048d401d4e9457988779a38b50c59ac 100644 (file)
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -84,6 +84,7 @@ import org.slf4j.LoggerFactory;
 
 import com.gitblit.Constants.AccessPermission;
 import com.gitblit.Constants.AccessRestrictionType;
+import com.gitblit.Constants.AccountType;
 import com.gitblit.Constants.AuthenticationType;
 import com.gitblit.Constants.AuthorizationControl;
 import com.gitblit.Constants.FederationRequest;
@@ -695,12 +696,12 @@ public class GitBlit implements ServletContextListener {
        public boolean supportsCredentialChanges(UserModel user) {
                if (user == null) {
                        return false;
-               } else if (!Constants.EXTERNAL_ACCOUNT.equals(user.password)) {
-                       // credentials likely maintained by Gitblit
-                       return userService.supportsCredentialChanges();
+               } else if (AccountType.LOCAL.equals(user.accountType)) {
+                       // local account, we can change credentials
+                       return true;
                } else {
-                       // credentials are externally maintained
-                       return false;
+                       // external account, ask user service
+                       return userService.supportsCredentialChanges();
                }
        }