diff options
| author | Stefan Zegenhagen <[email protected]> | 2012-08-01 10:24:36 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-08-01 15:23:15 +0200 |
| commit | d80886477127168f5780ea1782793bfaf1608cca (patch) | |
| tree | 95a1ee5c3337f92d18302e6e0c8904743b692260 /lib/ssh/src | |
| parent | 24ad2d1d985bbadb28dc8fe9dfee5e33c3bdcbbc (diff) | |
| download | otp-d80886477127168f5780ea1782793bfaf1608cca.tar.gz otp-d80886477127168f5780ea1782793bfaf1608cca.tar.bz2 otp-d80886477127168f5780ea1782793bfaf1608cca.zip | |
SSH: Make "auth_methods" server option re-usable
The 'auth_methods' option is used by the server side of the SSH code to
tell a connecting SSH client about the authentication methods that are
supported by the server. The code still extracts and handles the
'auth_methods' option from Opts in appropriate places, but the Opts
checking code in ssh.erl didn't allow that option to be specified.
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index f4a40c81a4..85f5f680e6 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -369,6 +369,8 @@ handle_option([{shell, _} = Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{exec, _} = Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); +handle_option([{auth_methods, _} = Opt | Rest], SocketOptions, SshOptions) -> + handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions). @@ -408,6 +410,8 @@ handle_ssh_option({exec, {Module, Function, _}} = Opt) when is_atom(Module), is_atom(Function) -> Opt; +handle_ssh_option({auth_methods, Value} = Opt) when is_list(Value) -> + Opt; handle_ssh_option({infofun, Value} = Opt) when is_function(Value) -> Opt; handle_ssh_option({connectfun, Value} = Opt) when is_function(Value) -> |