aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-10-19 12:42:37 +0200
committerHans Nilsson <[email protected]>2015-10-19 12:42:37 +0200
commitfdae664715f6b64e3f0c61729344bc372b67e1e2 (patch)
treebc24f1a0862dc9bb84ddc2e3fef560812431e203
parent1025c884863169b33148a7fbd8c4d5cbd1a903a1 (diff)
parentc2471ecc85c74b0489a1801bf5ea24b2cee19ca1 (diff)
downloadotp-fdae664715f6b64e3f0c61729344bc372b67e1e2.tar.gz
otp-fdae664715f6b64e3f0c61729344bc372b67e1e2.tar.bz2
otp-fdae664715f6b64e3f0c61729344bc372b67e1e2.zip
Merge branch 'hans/ssh/cuddle_spec' into maint
* hans/ssh/cuddle_spec: ssh: dialyzer fix
-rw-r--r--lib/ssh/src/ssh.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index b6ee29efbb..049018b21c 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -391,8 +391,9 @@ handle_option([{negotiation_timeout, _} = Opt|Rest], SocketOptions, SshOptions)
handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
handle_option([{parallel_login, _} = Opt|Rest], SocketOptions, SshOptions) ->
handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
-handle_option([parallel_login|Rest], SocketOptions, SshOptions) ->
- handle_option(Rest, SocketOptions, [handle_ssh_option({parallel_login,true}) | SshOptions]);
+%% (Is handled by proplists:unfold above:)
+%% handle_option([parallel_login|Rest], SocketOptions, SshOptions) ->
+%% handle_option(Rest, SocketOptions, [handle_ssh_option({parallel_login,true}) | SshOptions]);
handle_option([{minimal_remote_max_packet_size, _} = Opt|Rest], SocketOptions, SshOptions) ->
handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
handle_option([{id_string, _ID} = Opt|Rest], SocketOptions, SshOptions) ->