aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh.app.src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-02-28 10:29:24 +0100
committerIngela Anderton Andin <[email protected]>2012-02-28 10:29:24 +0100
commitbc50e697fbf392c99842d823eb67a564e1759376 (patch)
treeccf3969614c01cf2b2c24f2942529ccb570bf096 /lib/ssh/src/ssh.app.src
parentd9ee75fa3df8676deb92136c38b65e928cde196e (diff)
parent1aeb8f4234b52705f9a933abf8dcd1afb2296b9d (diff)
downloadotp-bc50e697fbf392c99842d823eb67a564e1759376.tar.gz
otp-bc50e697fbf392c99842d823eb67a564e1759376.tar.bz2
otp-bc50e697fbf392c99842d823eb67a564e1759376.zip
Merge branch 'ia/ssh/error-handling' into maint
* ia/ssh/error-handling: Prevent client hanging. (OTP-8111) Added checks of API input Improve check so that we will not try to read ssh packet length indicator if not sure we have enough data. Improved error handling
Diffstat (limited to 'lib/ssh/src/ssh.app.src')
-rw-r--r--lib/ssh/src/ssh.app.src2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 7a58dbe54f..316c09eb06 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -15,7 +15,7 @@
ssh_connection,
ssh_connection_handler,
ssh_connection_manager,
- ssh_connection_controler,
+ ssh_connection_sup,
ssh_shell,
sshc_sup,
sshd_sup,