diff options
| author | Hans Nilsson <[email protected]> | 2014-03-26 17:24:51 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-03-26 17:24:51 +0100 |
| commit | fb908b7ceccaef70a46bb14db8da3e6e373a9810 (patch) | |
| tree | 61aa6cc9794abcf310083e4594a5f32e380be367 /lib/ssh/src/ssh.erl | |
| parent | 2da14af988d563b5c53f42334e990f4c9021dd7a (diff) | |
| download | otp-fb908b7ceccaef70a46bb14db8da3e6e373a9810.tar.gz otp-fb908b7ceccaef70a46bb14db8da3e6e373a9810.tar.bz2 otp-fb908b7ceccaef70a46bb14db8da3e6e373a9810.zip | |
ssh: added daemon option 'parallel_login', default false
Diffstat (limited to 'lib/ssh/src/ssh.erl')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index 6f21ff843f..de6e8cc421 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -334,6 +334,10 @@ handle_option([{rekey_limit, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); 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]); handle_option([Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions). @@ -364,6 +368,8 @@ handle_ssh_option({connect_timeout, Value} = Opt) when is_integer(Value); Value Opt; handle_ssh_option({negotiation_timeout, Value} = Opt) when is_integer(Value); Value == infinity -> Opt; +handle_ssh_option({parallel_login, Value} = Opt) when Value==true ; Value==false -> + Opt; handle_ssh_option({user, Value} = Opt) when is_list(Value) -> Opt; handle_ssh_option({dsa_pass_phrase, Value} = Opt) when is_list(Value) -> |