diff options
author | Hans Nilsson <[email protected]> | 2015-06-10 13:38:04 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-06-10 13:38:04 +0200 |
commit | 455ae616947dce6bd6b514226e98b50ef176fd83 (patch) | |
tree | 325eb4b1445531f9d96da27e9fd4c27a396c7891 /lib/ssh/src/ssh.erl | |
parent | 98dcf1a06c2084909e546b779e4bb514a5f232f6 (diff) | |
parent | 5ad46d56c097ef17b77ef4532b7eb264e005fde1 (diff) | |
download | otp-455ae616947dce6bd6b514226e98b50ef176fd83.tar.gz otp-455ae616947dce6bd6b514226e98b50ef176fd83.tar.bz2 otp-455ae616947dce6bd6b514226e98b50ef176fd83.zip |
Merge branch 'hans/ssh/unknown_msgfun/OTP-12813'
* hans/ssh/unknown_msgfun/OTP-12813:
ssh: Option unexpectedfun for ssh:daemon and ssh:connect
Diffstat (limited to 'lib/ssh/src/ssh.erl')
-rw-r--r-- | lib/ssh/src/ssh.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index 826c585d65..86c042781c 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -345,6 +345,8 @@ handle_option([{connectfun, _} = Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{disconnectfun, _} = Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); +handle_option([{unexpectedfun, _} = Opt | Rest], SocketOptions, SshOptions) -> + handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{failfun, _} = Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{ssh_msg_debug_fun, _} = Opt | Rest], SocketOptions, SshOptions) -> @@ -450,7 +452,9 @@ handle_ssh_option({infofun, Value} = Opt) when is_function(Value) -> Opt; handle_ssh_option({connectfun, Value} = Opt) when is_function(Value) -> Opt; -handle_ssh_option({disconnectfun , Value} = Opt) when is_function(Value) -> +handle_ssh_option({disconnectfun, Value} = Opt) when is_function(Value) -> + Opt; +handle_ssh_option({unexpectedfun, Value} = Opt) when is_function(Value,2) -> Opt; handle_ssh_option({failfun, Value} = Opt) when is_function(Value) -> Opt; |