Merge pull request #908 from KostyaSha/JENKINS-17332

[JENKINS-17332] Allow sign up with username that exists because of SCM commit.
jenkinsci · Aug 13, 2013 · b52e32e · b52e32e
2 parents 4d8bfb5 + f633a44
commit b52e32e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
@@ -310,7 +310,9 @@ private User createAccount(StaplerRequest req, StaplerResponse rsp, boolean self
         else {
             User user = User.get(si.username, false);
             if (null != user)
-                si.errorMessage = Messages.HudsonPrivateSecurityRealm_CreateAccount_UserNameAlreadyTaken();
+                // Allow sign up. SCM people has no such property.
+                if (user.getProperty(Details.class) != null)
+                    si.errorMessage = Messages.HudsonPrivateSecurityRealm_CreateAccount_UserNameAlreadyTaken();
         }
 
         if(si.fullname==null || si.fullname.length()==0)