aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-01-18 16:26:43 +0100
committerFredrik Gustafsson <[email protected]>2013-01-18 16:26:43 +0100
commitd9614713b81aa13012113b99df0569efc26c2797 (patch)
tree75c45db0317e86408b829b8ba1e59e8fc6ce077c
parentb0e4f20f2abde9fc264995317966f373775e2b2b (diff)
downloadotp-d9614713b81aa13012113b99df0569efc26c2797.tar.gz
otp-d9614713b81aa13012113b99df0569efc26c2797.tar.bz2
otp-d9614713b81aa13012113b99df0569efc26c2797.zip
Fixed bug which lead to crash in startup of daemon, if port was in use
-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}