Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use ssh agent if privatekey and password are not set

This commit is contained in:
Huy TA 2015-04-24 16:57:33 +10:00 committed by Ignasi Barrera
parent b1231257fd
commit 522c080a4a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java
View File

@ -169,7 +169,7 @@ public final class SessionConnection implements Connection<Session> {
.getSession(loginCredentials.getUser(), hostAndPort.getHostText(), hostAndPort.getPortOrDefault(22)); .getSession(loginCredentials.getUser(), hostAndPort.getHostText(), hostAndPort.getPortOrDefault(22));
if (sessionTimeout != 0) if (sessionTimeout != 0)
session.setTimeout(sessionTimeout); session.setTimeout(sessionTimeout);
if (!loginCredentials.getOptionalPrivateKey().isPresent()) { if (loginCredentials.getOptionalPassword().isPresent()) {
session.setPassword(loginCredentials.getOptionalPassword().orNull()); session.setPassword(loginCredentials.getOptionalPassword().orNull());
} else if (loginCredentials.hasUnencryptedPrivateKey()) { } else if (loginCredentials.hasUnencryptedPrivateKey()) {
byte[] privateKey = loginCredentials.getOptionalPrivateKey().get().getBytes(); byte[] privateKey = loginCredentials.getOptionalPrivateKey().get().getBytes();