Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java

@@ -17,7 +17,7 @@

import java.util.Locale;

import org.apache.sshd.server.PasswordAuthenticator;
import org.apache.sshd.server.auth.password.PasswordAuthenticator;
import org.apache.sshd.server.session.ServerSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,13 +51,13 @@
      }

      username = username.toLowerCase(Locale.US);
      UserModel user = authManager.authenticate(username, password.toCharArray());
      UserModel user = authManager.authenticate(username, password.toCharArray(), null);
      if (user != null) {
         client.setUser(user);
         return true;
      }

      log.warn("could not authenticate {} for SSH using the supplied password", username);
      log.warn("could not authenticate {} ({}) for SSH using the supplied password", username, client.getRemoteAddress());
      return false;
   }
}