Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to work on some non-OpenBSD based systems #1

Merged
merged 2 commits into from
Oct 9, 2017
Merged

Updated to work on some non-OpenBSD based systems #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
378d07a
Updated to work on some non-OpenBSD based systems
bvulaj Oct 9, 2017
69520a3
Reverted some unecessary changes
bvulaj Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jsch-agent-proxy-sshj/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<dependencies>
<dependency>
<groupId>net.schmizz</groupId>
<groupId>com.hierynomus</groupId>
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This groupId changed during this time.

<artifactId>sshj</artifactId>
<version>[0.8.1,)</version>
</dependency>
Expand Down
3 changes: 2 additions & 1 deletion ...t-proxy-usocket-nc/src/main/java/com/jcraft/jsch/agentproxy/usocket/NCUSocketFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,13 @@ public NCUSocketFactory() throws AgentProxyException {
StringBuilder sb = new StringBuilder();
try {
p = Runtime.getRuntime().exec("nc -h");
InputStream is = p.getErrorStream();
InputStream is = p.getErrorStream().available() > 0 ? p.getErrorStream() : p.getInputStream();
byte[] buf = new byte[1024];
int i = 0;
while((i = is.read(buf, 0, buf.length))>0){
sb.append(new String(buf, 0, i));
}
is.close();
}
catch(IOException e){
}
Expand Down