diff options
| author | Hans Nilsson <[email protected]> | 2014-04-25 11:14:37 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-04-25 11:14:37 +0200 |
| commit | 3be1dc100140139b2542cd327cf4f8453d43aca1 (patch) | |
| tree | c213c21a92d9fbbb462513208f9b7a2c19d54a5a /lib/ssh/src/ssh.erl | |
| parent | 2c04be0d98793bbda21d2cab2ee990b3a6d085c1 (diff) | |
| parent | 4d957870d4e5ae98e91b9118f8b2e8319ab4fa33 (diff) | |
| download | otp-3be1dc100140139b2542cd327cf4f8453d43aca1.tar.gz otp-3be1dc100140139b2542cd327cf4f8453d43aca1.tar.bz2 otp-3be1dc100140139b2542cd327cf4f8453d43aca1.zip | |
Merge branch 'maint'
* maint:
ssh: Doc change on max_session param
ssh: Add max_session parameter to ssh:daemon
ssh: remove confusing info in some reports
Diffstat (limited to 'lib/ssh/src/ssh.erl')
| -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 de6e8cc421..75081b7a61 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -332,6 +332,8 @@ handle_option([{idle_time, _} = Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{rekey_limit, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); +handle_option([{max_sessions, _} = 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) -> @@ -366,6 +368,8 @@ handle_ssh_option({pref_public_key_algs, Value} = Opt) when is_list(Value), leng end; handle_ssh_option({connect_timeout, Value} = Opt) when is_integer(Value); Value == infinity -> Opt; +handle_ssh_option({max_sessions, Value} = Opt) when is_integer(Value), Value>0 -> + 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 -> |