You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2015/12/14 14:17:48 UTC
mina-sshd git commit: Using default client user authentication
preferences as specified in http://linux.die.net/man/5/ssh_config
(PreferredAuthentications)
Repository: mina-sshd
Updated Branches:
refs/heads/master a26ef1549 -> 0d26b1be6
Using default client user authentication preferences as specified in http://linux.die.net/man/5/ssh_config (PreferredAuthentications)
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/0d26b1be
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/0d26b1be
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/0d26b1be
Branch: refs/heads/master
Commit: 0d26b1be6a86c185046ff4ef8b261f1efccf53a4
Parents: a26ef15
Author: Lyor Goldstein <lg...@vmware.com>
Authored: Mon Dec 14 15:17:31 2015 +0200
Committer: Lyor Goldstein <lg...@vmware.com>
Committed: Mon Dec 14 15:17:31 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/sshd/client/SshClient.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0d26b1be/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
index e64b4cb..64bda18 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
@@ -160,12 +160,15 @@ public class SshClient extends AbstractFactoryManager implements ClientFactoryMa
}
};
- // NOTE: order is important as it defines the preference
+ /**
+ * Default user authentication preferences if not set
+ * @see <A HREF="http://linux.die.net/man/5/ssh_config">ssh_config(5) - PreferredAuthentications</A>
+ */
public static final List<NamedFactory<UserAuth>> DEFAULT_USER_AUTH_FACTORIES =
Collections.unmodifiableList(Arrays.<NamedFactory<UserAuth>>asList(
UserAuthPublicKeyFactory.INSTANCE,
- UserAuthPasswordFactory.INSTANCE,
- UserAuthKeyboardInteractiveFactory.INSTANCE
+ UserAuthKeyboardInteractiveFactory.INSTANCE,
+ UserAuthPasswordFactory.INSTANCE
));
public static final List<ServiceFactory> DEFAULT_SERVICE_FACTORIES =
Collections.unmodifiableList(Arrays.asList(