diff options
| author | Hans Nilsson <[email protected]> | 2014-03-27 11:08:06 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-03-27 11:08:06 +0100 |
| commit | d6b30f44ea610355dab47024acdcb9fc597f96cb (patch) | |
| tree | e92d281c5501e87b8916f2133931b103d39e5cbc /lib/ssh/doc/src/ssh.xml | |
| parent | be5ad8be918b803d4224e8d6b17a508d2559b8a1 (diff) | |
| parent | fb908b7ceccaef70a46bb14db8da3e6e373a9810 (diff) | |
| download | otp-d6b30f44ea610355dab47024acdcb9fc597f96cb.tar.gz otp-d6b30f44ea610355dab47024acdcb9fc597f96cb.tar.bz2 otp-d6b30f44ea610355dab47024acdcb9fc597f96cb.zip | |
Merge branch 'hans/ssh/login_hangs/OTP-11823'
Diffstat (limited to 'lib/ssh/doc/src/ssh.xml')
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index eaf96d0230..7fbd70c87e 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -304,6 +304,23 @@ <c><![CDATA[true]]></c> if the password is valid and <c><![CDATA[false]]></c> otherwise.</p> </item> + + <tag><c><![CDATA[{negotiation_timeout, integer()}]]></c></tag> + <item> + <p>Max time in milliseconds for the authentication negotiation. The default value is 2 minutes. + </p> + </item> + + <tag><c><![CDATA[{parallel_login, boolean()}]]></c></tag> + <item> + <p>If set to false (the default value), only one login is handled a time. If set to true, an unlimited logins will be allowed simultanously. Note that this affects only the connections with authentication in progress, not the already authenticated connections. + </p> + <warning> + <p>Do not enable parallel_logins without protecting the server by other means like a firewall. If set to true, there is no protection against dos attacs.</p> + </warning> + + </item> + <tag><c><![CDATA[{key_cb, atom()}]]></c></tag> <item> <p>Module implementing the behaviour <seealso marker="ssh_server_key_api">ssh_server_key_api</seealso>. |