aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-01-21 11:14:28 +0100
committerFredrik Gustafsson <[email protected]>2013-01-21 11:14:28 +0100
commit583ca8a0a86ad8ddfe4dc71c9f030f456fb8cc99 (patch)
tree2ae525856cc715dd6efe54bf43ab84108ac2a4fb /lib
parentcbca9e3d6eead9b4f6de0b66a9c223cdbe3d5af2 (diff)
parentd9614713b81aa13012113b99df0569efc26c2797 (diff)
downloadotp-583ca8a0a86ad8ddfe4dc71c9f030f456fb8cc99.tar.gz
otp-583ca8a0a86ad8ddfe4dc71c9f030f456fb8cc99.tar.bz2
otp-583ca8a0a86ad8ddfe4dc71c9f030f456fb8cc99.zip
Merge branch 'fredrik/ssh/port_in_use_error'
* fredrik/ssh/port_in_use_error: Fixed bug which lead to crash in startup of daemon, if port was in use
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/src/ssh.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 3ef26b1678..b5a0aa2e05 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -278,7 +278,9 @@ do_start_daemon(Host, Port, Options, SocketOptions) ->
{ok, SysSup} ->
{ok, SysSup};
{error, {already_started, _}} ->
- {error, eaddrinuse}
+ {error, eaddrinuse};
+ {error, R} ->
+ {error, R}
catch
exit:{noproc, _} ->
{error, ssh_not_started}