Mirrors/sshj
1
0
Fork 0
mirror of https://github.com/hierynomus/sshj.git synced 2025-12-07 07:40:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

loadKnownHosts logic was kinda senseless

Browse Source
This commit is contained in:
Shikhar Bhushan
2010-03-07 02:48:46 +01:00
parent bd738962f5
commit 7a31b23d26
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/schmizz/sshj/SSHClient.java
View File

@@ -515,8 +515,12 @@ public class SSHClient
final File sshDir = OpenSSHKnownHosts.detectSSHDir(); final File sshDir = OpenSSHKnownHosts.detectSSHDir();
if (sshDir != null) { if (sshDir != null) {
for (File loc : Arrays.asList(new File(sshDir, "known_hosts"), new File(sshDir, "known_hosts2"))) { for (File loc : Arrays.asList(new File(sshDir, "known_hosts"), new File(sshDir, "known_hosts2"))) {
try {
loadKnownHosts(loc); loadKnownHosts(loc);
loaded = true; loaded = true;
} catch (IOException e) {
// Ignore for now
}
} }
} }
if (!loaded) if (!loaded)
@@ -570,7 +574,7 @@ public class SSHClient
* server * server
*/ */
public X11Forwarder registerX11Forwarder(ConnectListener listener) { public X11Forwarder registerX11Forwarder(ConnectListener listener) {
X11Forwarder x11f = new X11Forwarder(conn, listener); final X11Forwarder x11f = new X11Forwarder(conn, listener);
conn.attach(x11f); conn.attach(x11f);
return x11f; return x11f;
} }
@@ -606,7 +610,7 @@ public class SSHClient
public Session startSession() public Session startSession()
throws ConnectionException, TransportException { throws ConnectionException, TransportException {
assert isConnected() && isAuthenticated(); assert isConnected() && isAuthenticated();
SessionChannel sess = new SessionChannel(conn); final SessionChannel sess = new SessionChannel(conn);
sess.open(); sess.open();
assert sess.isOpen(); assert sess.isOpen();
return sess; return sess;
@@ -650,7 +654,7 @@ public class SSHClient
throws TransportException { throws TransportException {
assert trans.isRunning(); assert trans.isRunning();
long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
try { try {
trans.doKex(); trans.doKex();