You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2014/09/15 10:16:34 UTC
[1/2] git commit: [SSHD-335] Wrong EOF error handling in sshd agent
Repository: mina-sshd
Updated Branches:
refs/heads/master 004c2045c -> 247f5e4d1
[SSHD-335] Wrong EOF error handling in sshd agent
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/f0921ddb
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/f0921ddb
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/f0921ddb
Branch: refs/heads/master
Commit: f0921ddbe7e16e30e0ceb470c79fcb102e8634e5
Parents: 004c204
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Sep 15 09:21:08 2014 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Sep 15 09:21:08 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/sshd/agent/unix/AgentForwardedChannel.java | 2 +-
.../src/main/java/org/apache/sshd/agent/unix/AgentServer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f0921ddb/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentForwardedChannel.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentForwardedChannel.java b/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentForwardedChannel.java
index ca7172a..327bf66 100644
--- a/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentForwardedChannel.java
+++ b/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentForwardedChannel.java
@@ -41,7 +41,7 @@ public class AgentForwardedChannel extends AbstractClientChannel implements Runn
byte[] buf = new byte[1024];
while (true) {
int result = Socket.recv(socket, buf, 0, buf.length);
- if (result == Status.APR_EOF) {
+ if (result == -Status.APR_EOF) {
break;
} else if (result < Status.APR_SUCCESS) {
AgentServerProxy.throwException(result);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f0921ddb/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentServer.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentServer.java b/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentServer.java
index b42c4a7..fa5847c 100644
--- a/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentServer.java
+++ b/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentServer.java
@@ -103,7 +103,7 @@ public class AgentServer {
byte[] buf = new byte[1024];
while (true) {
int result = Socket.recv(socket, buf, 0, buf.length);
- if (result == Status.APR_EOF) {
+ if (result == -Status.APR_EOF) {
break;
} else if (result < Status.APR_SUCCESS) {
throwException(result);
[2/2] git commit: Fix missing header
Posted by gn...@apache.org.
Fix missing header
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/247f5e4d
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/247f5e4d
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/247f5e4d
Branch: refs/heads/master
Commit: 247f5e4d1af0261cffd5c54f62249f8578dbdc2e
Parents: f0921dd
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Sep 15 10:16:25 2014 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Sep 15 10:16:25 2014 +0200
----------------------------------------------------------------------
.../AbstractGeneratorHostKeyProviderTest.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/247f5e4d/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProviderTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProviderTest.java b/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProviderTest.java
index 6c1530b..8720e94 100644
--- a/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProviderTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProviderTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.sshd.server.keyprovider;
import org.junit.Rule;