svn commit: r1095809 - /mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java

[sp...@apache.org]

Author: spearce
Date: Thu Apr 21 20:30:17 2011
New Revision: 1095809

URL: http://svn.apache.org/viewvc?rev=1095809&view=rev
Log:
[SSHD-117] Ignore "keepalive@jcraft.com"

Modified:
    mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java

Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java?rev=1095809&r1=1095808&r2=1095809&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java (original)
+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java Thu Apr 21 20:30:17 2011
@@ -530,7 +530,7 @@ public class ServerSession extends Abstr
     private void globalRequest(Buffer buffer) throws Exception {
         String req = buffer.getString();
         boolean wantReply = buffer.getBoolean();
-        if (req.equals("keepalive@openssh.com") || req.equals("keepalive@lag.net")) {
+        if (req.startsWith("keepalive@")) {
             // Relatively standard KeepAlive directive, just wants failure
         } else if (req.equals("no-more-sessions@openssh.com")) {
             allowMoreSessions = false;
@@ -542,7 +542,7 @@ public class ServerSession extends Abstr
             return;
         } else {
             log.info("Received SSH_MSG_GLOBAL_REQUEST {}", req);
-            log.error("Unknown global request: {}", req);
+            log.warn("Unknown global request: {}", req);
         }
         if (wantReply) {
             buffer = createBuffer(SshConstants.Message.SSH_MSG_REQUEST_FAILURE, 0);