summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2016-08-03 17:47:23 +0900
committerDavid Pursehouse <dpursehouse@collab.net>2016-08-10 07:01:24 +0000
commitf57d2b8f830710d6e25d501f4dc8d76f2d2e71f2 (patch)
tree782d8169849e6060f231f73c97818e64f99ecaf4
parent776e004f059d4d4b4d6e3f24490aa0336762f614 (diff)
SshDaemon: Set up the session timeout to make sshd.idleTimeout work
SshServer#start() sets up the session timeout by calling: setupSessionTimeout(sessionFactory); but SshDaemon overrides the start() method, does not call super(), and does not call setupSessionTimeout. Therefore, no session timeout is set up on ssh sessions, and sessions continue to be kept open beyond the timeout specified in the configured sshd.idleTimeout. Change-Id: Ia72980d3f0f700386f62d301164f61f32405528e (cherry picked from commit b150ce534a7a9fda382fbea177e90b13b45b7ed7)
-rw-r--r--gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
index 39eb720c9b..5fb1cfa8f8 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
@@ -304,6 +304,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
sessionFactory = createSessionFactory();
}
sessionFactory.setServer(this);
+ setupSessionTimeout(sessionFactory);
daemonAcceptor = createAcceptor();
try {